Fixed an excess quote
Worked around cyclic import
Not sure why these referred to Map and were not just regular class attributes.
things are registered properly.
Merge branch 'map_refactor' of https://github.com/Cadair/sunpy into map_refactor