update README links
regen docs
Merge branch 'master' into gh-pages