Merging from local repo

Brining a load of small changes over. More sophisticated SimpleTemplates, various validator improvements, slight change in the processing order for AppHandler and more...