Update README.md

[skip ci]
Update .travis.yml
Merge branch 'update' into update.macosx