fix .travis.yml
Merge branch 'fix_travis'