Updated .travis.yml and README.md
Merge branch 'develop'