make the py.test mark `online` Python 2.6 compatible
Merge pull request #632 from derdon/pytest-online-fix

make the py.test mark `online` Python 2.6 compatible
pyfits removal
Merge pull request #622 from Cadair/0.4_pyfits

Remove pyfits
bump glymur requirement in setup.py
Merge branch 'master' of https://github.com/sunpy/sunpy into database