disabled email notifications and tests, added test to ensure sad path works for users update
fixed failing test
Merge pull request #301 from yggie/fixes

Emergency fixes
Merge pull request #302 from AgileVentures/develop

Deploying to Staging
Merge pull request #303 from AgileVentures/staging

Deploying mailer fix to Production