Trying with handlebars.
Now it is working better, albeit under less than idea circumstances.
Merge branch 'master' into test
Removed unused files.