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.
A more clear definition of sun-earth distances and ephemerids for SoHO. It should close #430 where most discussion have happened
Change Travis to SunPy IRC
Merge pull request #512 from examon/added-test_resample

Added test_resample.py, tests for resample and reshape_image_to_4d_superpixel.
Merge pull request #535 from dpshelio/0.3_sunrad

Solar radius, SoHO and distances (the good one for 0.3)
fix write of KEYCOMMENTS
doc KEYCOMMENTS [ci skip]
code tidy
Merge pull request #521 from Cadair/0.3_fits

Add Key Comments to FileHeader for fits files
Merge branch '0.3' of https://github.com/sunpy/sunpy into extract_waveunit

Conflicts:
	sunpy/io/fits.py