Tricia

hopefully this doesn't cause a merge conflict................. 

mailer works! comment and achievement models-ish
Use 2 spaces for indentation in a hash, relative to the start of the line where the left curly brace is.