tweaks
Merge branch 'map_refactor' of github.com:Cadair/sunpy into map_refactor