[scikit-image] Squash merges

[Stefan van der Walt]

Core team,

I have re-enabled the squash merge button.  I still think, ideally, that
contributors should organize their patches as best they can, but at the
same time this is a convenient way of merging simple changes that had to
go through a few commit iterations.

Please use as you see fit.

Thanks
Stéfan