Update README.md

[skip ci]
Update README.md

[skip ci]
Merge remote-tracking branch 'origin/master' into osx
update travis.yml