Refactor Rails 4.1 compatibility approach per Norman's suggestions
Merge pull request #505 from petergoldstein/feature/rails_4_1_take_two

Refactor Rails 4.1 compatibility approach per Norman's suggestions