Updates from working on My Site

Trying to clean out epc/project specific stuff like templates.