Remove timber/twig support for now.  Fix formatting.