Updates README docs and ammends travis commit.
Merge branch 'master' into gh-pages