Edit factories to reflect updated schema
Fix merge conflict
Merge pull request #27 from spring-peepers-2014/campaigns

Campaigns