-Don't allow a user to have email that conflicts with username of another user.
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise