Merge branch 'gh-pages'
fixing URLs
Merge branch 'master' into gh-pages
more URL fixes
Merge branch 'master' into gh-pages