Update sunpy/__init__.py
Merge remote-tracking branch 'upstream/master' into aiaprep