Navigation and template updates
Merge branch 'master' of https://github.com/natewinck/surfstat