edx/edx-platform — pull request #5858 by rlucioni (2014-11-06 03:40:06+00:00)
Title: Return more helpful error messages when a resource conflict occurs

As per [ECOM-584](https://openedx.atlassian.net/browse/ECOM-584). This also removes misplaced instructions which appeared beneath the email field on the registration form.

@AlasdairSwan and/or @dianakhuang, how's it look?