fix for rails upgrade
Merge branch 'master' of github.com:landcentral/eloqua