Update User model validations and tests through 6.2
Merge branch 'modeling-users' of https://github.com/jdmaresco/rails_sample_app into modeling-users