Issue 3285:  Include the site name in the sender field of notification emails
Fixing mailer issues
More rebase nonsense
Added tests
Created specs for the mailers
Update to newest version of FactoryGirl syntax
Fixing collection mailer spec
Merge pull request #862 from scottsds/issue_3285

Issue 3285:  Include the site name in the sender field of notification e...