account for no location path in initial page
Merge branch 'master' into gh-pages