Upgraded to factory_girl 3.6 and factory_girl_rails 3.6
Upgraded to factory_girl 4.4 and factory_girl_rails 4.4