Rewrite.
Merge branch 'master' of github.com:shannonmoeller/handlebars-layouts

Conflicts:
	README.md
	package.json