Tricia

hopefully this doesn't cause a merge conflict................. 

mailer works! comment and achievement models-ish
Trailing whitespace detected.