setup FactoryGirl, added username to User table, updated user page and tests