Added some anti-caching hacks so hopefully saving will appear more consistent.
Also finished removing all traces of TemplateEngine, which should probably warrant full-scale re-testing.