Merge pull request #98 from isfit/campaign_fix

Fix some rails 4 issues
gerge branch 'master' of https://github.com/isfit/internal.isfit.org into campaign_fix
Removes binding.pry