use Gem::Requirement to check Rails versions
Convert a few more Rails.version instances
Merge branch 'crazymykl-master'