Make pyfits an optional dependancy with astropy.io.fits first
Build deps and setup.py changed from pyfits to astropy
Merge remote-tracking branch 'upstream/staging' into pyfits

Conflicts:
	.travis.yml
	setup.py
Fix fails due to pyfits.core
Merge pull request #488 from Cadair/pyfits

Deprecate pyfits in place of astropy
Merge branch 'staging' of https://github.com/sunpy/sunpy into database
added the classmethod Database.from_fits_filepath and the function entries_from_path to import FITS files to a database