Changed to FactoryGirl
Finish updating users