Nick O: Updated to track changes in thundr1
Merge branch 'feature/thundr1' of https://github.com/3wks/thundr-handlebars into feature/thundr1

Conflicts:
	.gitignore