undo some changes i made by mistake on .travis.yml
Merge branch 'master' into hide_git_dir