Upgraded to FactoryGirl 3 and FactoryGirlRails 2
Replaced usage of deprecated methods from factory_girl gem