change travis.yml
Merge branch 'travis_change'