Update .travis.yml
Merge from wampv1