Update README.md
Merge branch 'develop'
updated travis.