Upgrade to FactoryGirl 4

Upgrade FactoryGirl to 4. Dependant on `rspec-3`-merge.