update travis.yml
Merge branch 'work'