Allows for factory_girl2 aliases

[Fixes ianwhite/pickle#28]
Merge branch 'factory_girl_2_aliases_proper'