Refactor travis.yml