Final travis fixes!
!
Merge branch 'staging' of github.com:sunpy/sunpy into staging