Syntax fix for 1.8
Upgraded factory_girl and all the factories and uses
Upgraded database schema for acts_as_audited
Really upgrade factory_girl this time