remove .hbs extensions from template paths.
Merge branch 'dev' into gh-pages