fix .travis.yml name
Merge branch 'travis_ci'