Trimming production config for heroku
Fix syntax error with last commit
Account for single quote
Fix merge conflicts