edit travis.yml
Merge branch 'hotfix/travis_edit'

* hotfix/travis_edit:
  edit travis.yml