Add username to user model, update signin and settings forms