Fixes for minor travis fails

Attemps to fix these travis errors: https://travis-ci.org/sunpy/sunpy/builds/35957652