Merging hastache in an attempt to fix templating woes