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 for issue #423
fixed bug in eve not setting filename properly
Store all comments in FileHeader from FITS
change comments name
removed extra line
add upgrade flags
Merge branch '0.3_wheels' of github.com:Cadair/sunpy into 0.3_wheels

Conflicts:
	.travis.yml
yml syntax fix
pandas no-deps
WHEEL ALL THE THINGS
Add IRC notifications to Travis Builds
remove redundant bash script
add extra path section to helioviewer docs