sunpy/sunpy — pull request #453 by Cadair (2013-05-07 10:50:17+00:00)
Title: Pull stuff from master back to staging

random things in wrong branch.