resolve changes from merge conflict from mail.js differences
Fix typo in mail.js
Checking in production config settings
Sorting out production config issues