integrate twig into system

Signed-off-by: Dave Seaton <dave@bigspring.co.uk>
cleanup

Signed-off-by: Dave Seaton <dave@bigspring.co.uk>
Merge branch 'refs/heads/twig-integration' into 1.0-wip