Fix some rails 4 issues
Merge with master
Merge pull request #98 from isfit/campaign_fix

Fix some rails 4 issues