more composite
Merge branch 'map_refactor' of github.com:Cadair/sunpy into map_refactor
Add depreciation decorator
Changed deprecation decorator
map.py -> mapbase.py
Compmap import
Merge branch 'map_refactor' of github.com:Cadair/sunpy into map_refactor

Conflicts:
	sunpy/map/compositemap.py