Update .travis.yml

Multiple Fixes and simplification.
Merge pull request #1457 from juancarlospaco/patch-2

Update .travis.yml