clean up .travis.yml, refactor