action mailer edits
Merge pull request #71 from apatel/master

action mailer edits