emailing
pg
config update
heroku config
email fix
merge email