clean up User model error messages
Merge branch 'master' of github.com:opengovfoundation/madison