FIX bug #832 + testcase
Merge pull request #937 from sciunto/doc

Fix typo in SimilarityTransform docstring
MAINT: python3 compat.
Merge pull request #938 from sciunto/draw

Ellipse should not return coordinates outside of the image (closes #832)
Merge pull request #939 from sciunto/py3

Python 3 compatibility for contribs build script
minor changes in syntax in _glcm_loop method.
Using round in place of floor in _texture.pyx to calculate the pixel offset.
Merged with master
Merge branch 'master' of https://github.com/scikit-image/scikit-image
Merge pull request #935 from neerajgangwar/fix-greycomatrix

Correctly calculate offsets in grey-level co-occurrence matrices
Fixes for making code more pythonic, follow conventions
changed f to fig
changed f to fig in applications
Extract changes by @synesthesiam in PR #797
Upgrade numpydoc to version 0.4
Merge branch 'master' of https://github.com/scikit-image/scikit-image
Merged with ahojnnes novice
Remove debug print in contribs
Merge pull request #947 from stefanv/build/contribs

Remove debug print in contribs
Use nearest neighbor interpolation and a gray-level color map for plotting feature matches
Merge pull request #948 from stefanv/bug/plot_matches-cmap-interp

Use nearest neighbor interpolation and a gray-level color map for plotting feature matches