Updated .travis.yml
Merge branch 'travis-yml'