fixing .travis.yml again. Had a bad merge