Rebase
Issue 2035: Admin notification has subject. Cucumber test.
Merge branch 'master' into issue_2035
Cleaning up the mailer a bit
Merge branch 'master' into issue_2035
Update admin mailer and tests
Issue 3952: Hopefully kill the last Story
Merge branch 'master' into issue_2035
Merge pull request #1622 from LadyOscar/issue_3952

Issue 3952: Hopefully kill the last Story
Merge pull request #854 from scottsds/issue_2035

Issue 2035:  Admin notification message should have the subject in the c...