Adjust paths so things work for local dev and deployed
Merge branch 'master' into gh-pages
Rebuild pages