Cleanup .travis.yml some more?