consistently call page 'home'
Merge branch 'master' into gh-pages