diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..31ba80b2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "doc/tools/gitwash"]
+	path = doc/tools/gitwash
+	url = git@github.com:matthew-brett/gitwash.git
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b91e9522..aba19f3b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -74,3 +74,7 @@
 
 - David-Warde Farley, Sturla Molden
   Bresenheim line drawing, from snippets on numpy-discussion.
+
+- Christoph Gohlke
+  Windows packaging and Python 3 compatibility.
+
diff --git a/doc/Makefile b/doc/Makefile
index 29159699..08aaa703 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -123,4 +123,6 @@ gitwash:
 	python tools/gitwash/gitwash_dumper.py source scikits.image \
 	--project-url=http://scikits-image.org \
 	--project-ml-url=http://groups.google.com/group/scikits-image \
+	--repo-name=scikits.image \
+	--github-user=scikits-image \
 	--source-suffix=.txt
diff --git a/doc/source/gitwash/following_latest.txt b/doc/source/gitwash/following_latest.txt
index bdf07f4a..9dfff734 100644
--- a/doc/source/gitwash/following_latest.txt
+++ b/doc/source/gitwash/following_latest.txt
@@ -10,7 +10,7 @@ These are the instructions if you just want to follow the latest
 The steps are:
 
 * :ref:`install-git`
-* get local copy of the git repository from github
+* get local copy of the `scikits.image github`_ git repository
 * update local copy from time to time
 
 Get the local copy of the code
@@ -18,7 +18,7 @@ Get the local copy of the code
 
 From the command line::
 
-   git clone git://github.com/scikits.image/scikits.image.git
+   git clone git://github.com/scikits-image/scikits.image.git
 
 You now have a copy of the code tree in the new ``scikits.image`` directory.
 
diff --git a/doc/source/gitwash/maintainer_workflow.txt b/doc/source/gitwash/maintainer_workflow.txt
index 64a12d99..cfcd3d38 100644
--- a/doc/source/gitwash/maintainer_workflow.txt
+++ b/doc/source/gitwash/maintainer_workflow.txt
@@ -16,7 +16,7 @@ access to the upstream repo.  Being a maintainer, you've got read-write access.
 It's good to have your upstream remote have a scary name, to remind you that
 it's a read-write remote::
 
-    git remote add upstream-rw git@github.com:scikits.image/scikits.image.git
+    git remote add upstream-rw git@github.com:scikits-image/scikits.image.git
     git fetch upstream-rw
 
 *******************
diff --git a/doc/source/gitwash/patching.txt b/doc/source/gitwash/patching.txt
index 110666aa..7b990f86 100644
--- a/doc/source/gitwash/patching.txt
+++ b/doc/source/gitwash/patching.txt
@@ -29,7 +29,7 @@ Overview
    git config --global user.email you@yourdomain.example.com
    git config --global user.name "Your Name Comes Here"
    # get the repository if you don't have it
-   git clone git://github.com/scikits.image/scikits.image.git
+   git clone git://github.com/scikits-image/scikits.image.git
    # make a branch for your patching
    cd scikits.image
    git branch the-fix-im-thinking-of
@@ -59,7 +59,7 @@ In detail
 #. If you don't already have one, clone a copy of the
    scikits.image_ repository::
 
-      git clone git://github.com/scikits.image/scikits.image.git
+      git clone git://github.com/scikits-image/scikits.image.git
       cd scikits.image
 
 #. Make a 'feature branch'.  This will be where you work on
diff --git a/doc/source/gitwash/set_up_fork.txt b/doc/source/gitwash/set_up_fork.txt
index fe4a7684..c0e16314 100644
--- a/doc/source/gitwash/set_up_fork.txt
+++ b/doc/source/gitwash/set_up_fork.txt
@@ -13,7 +13,7 @@ Overview
 
    git clone git@github.com:your-user-name/scikits.image.git
    cd scikits.image
-   git remote add upstream git://github.com/scikits.image/scikits.image.git
+   git remote add upstream git://github.com/scikits-image/scikits.image.git
 
 In detail
 =========
@@ -46,7 +46,7 @@ Linking your repository to the upstream repo
 ::
 
    cd scikits.image
-   git remote add upstream git://github.com/scikits.image/scikits.image.git
+   git remote add upstream git://github.com/scikits-image/scikits.image.git
 
 ``upstream`` here is just the arbitrary name we're using to refer to the
 main scikits.image_ repository at `scikits.image github`_.
@@ -59,8 +59,8 @@ use it to merge into our own code.
 Just for your own satisfaction, show yourself that you now have a new
 'remote', with ``git remote -v show``, giving you something like::
 
-   upstream	git://github.com/scikits.image/scikits.image.git (fetch)
-   upstream	git://github.com/scikits.image/scikits.image.git (push)
+   upstream	git://github.com/scikits-image/scikits.image.git (fetch)
+   upstream	git://github.com/scikits-image/scikits.image.git (push)
    origin	git@github.com:your-user-name/scikits.image.git (fetch)
    origin	git@github.com:your-user-name/scikits.image.git (push)
 
diff --git a/doc/source/gitwash/this_project.inc b/doc/source/gitwash/this_project.inc
index f7c01aa2..9be8d57a 100644
--- a/doc/source/gitwash/this_project.inc
+++ b/doc/source/gitwash/this_project.inc
@@ -1,5 +1,5 @@
 .. scikits.image
 .. _scikits.image: http://scikits-image.org
-.. _`scikits.image github`: http://github.com/scikits.image/scikits.image
+.. _`scikits.image github`: http://github.com/scikits-image/scikits.image
 
 .. _`scikits.image mailing list`: http://groups.google.com/group/scikits-image
diff --git a/doc/tools/gitwash b/doc/tools/gitwash
index e02c2af7..06d130ab 160000
--- a/doc/tools/gitwash
+++ b/doc/tools/gitwash
@@ -1 +1 @@
-Subproject commit e02c2af711ff6b905a3e75f99f55e078a88e6b7e
+Subproject commit 06d130ab98d78e5a831b32a6624cad2bc481cacd
diff --git a/scikits/image/__init__.py b/scikits/image/__init__.py
index c9307cf9..8d8d51ec 100644
--- a/scikits/image/__init__.py
+++ b/scikits/image/__init__.py
@@ -3,7 +3,8 @@
 
 import os.path as _osp
 
-data_dir = _osp.abspath(_osp.join(_osp.dirname(__file__), 'data'))
+pkg_dir = _osp.abspath(_osp.dirname(__file__))
+data_dir = _osp.join(pkg_dir, 'data')
 
 from version import version as __version__
 
@@ -11,8 +12,7 @@ def _setup_test():
     import gzip
     import functools
 
-    basedir = _osp.dirname(_osp.join(__file__, '../'))
-    args = ['', '--exe', '-w', '%s' % basedir]
+    args = ['', '--exe', '-w', '%s' % pkg_dir]
 
     try:
         import nose as _nose
diff --git a/scikits/image/morphology/tests/test_watershed.py b/scikits/image/morphology/tests/test_watershed.py
index ca7c43bf..265a25e2 100644
--- a/scikits/image/morphology/tests/test_watershed.py
+++ b/scikits/image/morphology/tests/test_watershed.py
@@ -388,11 +388,9 @@ class TestWatershed(unittest.TestCase):
         before = time.clock() 
         out = watershed(image, markers, self.eight)
         elapsed = time.clock() - before
-        print "Fast watershed ran a megapixel image in %f seconds"%(elapsed)
         before = time.clock()
         out = scipy.ndimage.watershed_ift(image.astype(np.uint16), markers, self.eight)
         elapsed = time.clock() - before
-        print "Scipy watershed ran a megapixel image in %f seconds"%(elapsed)
 
 
 class TestIsLocalMaximum(unittest.TestCase):
diff --git a/scikits/image/transform/tests/test_project.py b/scikits/image/transform/tests/test_project.py
index 363ff2b7..f1756f99 100644
--- a/scikits/image/transform/tests/test_project.py
+++ b/scikits/image/transform/tests/test_project.py
@@ -39,8 +39,6 @@ def test_fast_homography():
     H[:2, 2] = [tx, ty]
 
     for mode in ('constant', 'mirror', 'wrap'):
-        print 'Transform mode:', mode
-
         p0 = homography(img, H, mode=mode, order=1)
         p1 = fast_homography(img, H, mode=mode)
         p1 = np.round(p1)
@@ -54,7 +52,6 @@ def test_fast_homography():
         ## plt.show()
 
         d = np.mean(np.abs(p0 - p1))
-        print "delta=", d
         assert d < 0.2
     
 
diff --git a/setup.py b/setup.py
index 9d9ab45d..00398ab5 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ Image processing algorithms for SciPy, including IO, morphology, filtering,
 warping, color manipulation, object detection, etc.
 
 Please refer to the online documentation at
-http://stefanv.github.com/scikits.image
+http://scikits-image.org/
 """
 
 DISTNAME            = 'scikits.image'