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.
Merge pull request #512 from examon/added-test_resample

Added test_resample.py, tests for resample and reshape_image_to_4d_superpixel.