Update .travis.yml

Multiple Fixes and simplification.