Use relative paths to make the site relocatable.
Merge branch 'master' into gh-pages
More relative paths
Merge branch 'master' into gh-pages