Update README.md

Travis badge link for this repo.
Update README.md

Build badge points to master branch build.
Merge remote-tracking branch 'upstream/master'