Add username field to user table
Update everything to work with new username column
Add FactoryGirl
Replace with FactoryGirl where possible