adding mako templates, moving templates and static into the machete directory
Merge remote-tracking branch 'origin/master'