Travis tweak
Merge branch 'staging' of github.com:sunpy/sunpy into staging
Merge branch 'staging' of github.com:sunpy/sunpy into staging