Synced with upstream
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'staging' of github.com:sunpy/sunpy
Update sunpy/__init__.py

updated version number
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
Merge remote-tracking branch 'upstream/staging' into map
Merge pull request #477 from sunpy/staging

Time to sync master with staging again
Make pyfits an optional dependancy with astropy.io.fits first
Build deps and setup.py changed from pyfits to astropy
Force deps pyfits>3 and numpy>1.6
fixes
should pass TravisCI, disabled jp2 tests till work around can be found
Merge pull request #482 from Cadair/map_refactor

The MAP REFACTOR is here!
Merge remote-tracking branch 'upstream/staging' into pyfits

Conflicts:
	.travis.yml
	setup.py
merge from upstream (map refactor)
fix to map grid plotting which got lost in refactor
fixed bug in plotting of compositemaps
Merge pull request #489 from ehsteve/map

A few bug fix for refactor and plotting