Merge pull request #477 from sunpy/staging

Time to sync master with staging again
Fix for issue #432
Added tests for resample and reshape_image_to_4d_superpixel
Merge branch 'staging' of https://github.com/sunpy/sunpy into added-test_resample
Changed make_map to map.Map.
Add filetype to io.file_tools
Change readme deps
Fix COMMENT and HISTORY duplication bug
Silly patch is silly
Merge pull request #516 from Cadair/0.3_fits_bugfix

Fix a bug with fits IO
Merge pull request #518 from sunpy/staging

0.3
Borrow wheel script from Astropy
Change .travis.yml to use wheels
Use my wheel host
tweak mpl and try again
don't use the bash script
Setuptools bump
no jurko
no jurko -2
fix for issue #423