FIX .travis.yml
merge