Update to work with factorygirl trunk

Might be worth adding a rescue to support old versions as well