Fixing Rails 3.2 deprecations
Merge pull request #1872 from daviddavis/rails32_deprecations

Rails 3.2: Fixing deprecations