Added aiaprep to sunpy.instr.aia
Added AIAMap.processing_level.
Merge branch 'aiaprep' of https://github.com/Cadair/sunpy into aiaprep
Seriously what is this?!
Merge remote-tracking branch 'upstream/master' into aiaprep

Conflicts:
	doc/logo/sunpy_logo.svg
Merge branch 'master' into aiaprep
Merge remote-tracking branch 'upstream/master' into aiaprep
Adjusted _plot_limb to use the map.center property if defined.
Merge remote-tracking branch 'upstream/staging' into aiaprep

Conflicts:
	sunpy/map/map.py
Merge remote-tracking branch 'upstream/staging' into aiaprep
Merge branch 'staging' into aiaprep
Merge branch 'staging' into aiaprep
Changes to aiaprep()
Fixed typo in compositemap.py
Merge branch '0.3' into aiaprep

Conflicts:
	sunpy/map/mapbase.py
Removed print statements from Map.rotate()
Resolve merge conflict
Update to US spelling of centre
Merge pull request #7 from drewleonard42/aiaprep

Aiaprep
update to meta