Changed to heroku postgres database url
Merge branch 'master' into preview
updated settings
added localsettings
Merge branch 'master' into preview
added EMAIL_BACKEND settings
added tests for environ