stamp emails with STAGING if they are sent from the staging server
Merge branch 'enhancements'