Update .travis.yml for branches
Merge branch 'master' into level-rewrite