Add username to user model (along with profile and city)
Update views, form, and routes to prefer username