added actionmailer controller, edited AR relationships and models for better amiling
Deleted a file, git! THAT'S ALL
qMerge branch 'master' into actionmailer_mk2