Attempt to fix travis-ci/general suckage