A working on a new templating integration and improved error handling
Merge branch 'master' of github.com:eventEmitter/ee-templates
Fixed tests and hacked some errors, this is a temporary fix.