Update .travis.yml

No need for tip tests, when 1.2 is released, and enabled in travis, then it will be added.
Merge branch 'master' into flattened

Resolved conflicts in .travis.yml