Rename email testing output, use current app for referral emails.
Merge branch 'dev-v2email' into dev