Cleaned up some of the template modifiers
Refactored email templates, ditched trimpath in favor of underscore