Simplify .travis.yml a bit