added columns to users with db:migrate
user validation tests pass
merge master