Add links to github/web versions
Merge branch 'master' into gh-pages