Refactored .travis.yml a little