update .travis.yml
 update .travis.yml
Merge branch 'develop'