Merge pull request #191 from ChrisBeaumont/cleanup

Small tidying
Better emulation of ds9 image scaling. #171
Fix for MPL <= 1.1
Merge pull request #190 from glue-viz/ds9

Better emulation of ds9 image scaling. #171
tests