Gem updates.  Major changes to use the latest FactoryGirl.