Refactored .travis.yml