Merge branch 'nested-view-paths' into path

Conflicts:
	lib/hbs.js
	package.json
Do not replace template name