Changed logic of email and username check to be robust in the face of someone in the admin manually adding an email twice. Tests Passed
Merge branch 'master' of https://github.com/mjkilian1992/Dentest