Fixes dependencies and updates FactoryGirl dev dep