Updated factory_girl (no, really!)