Changed error behavior to avoid caught errors
Merge branch 'v0.1'

Conflicts:
	lib/rewrite/Template.js
	package.json
Merge