Update README.
Update README with travis.
Merge branch 'master' into gh-pages