Upgrading Rails, switching nested_has_many_through to the gem version
Merge pull request #1064 from elzj/rails_upgrade

Upgrading Rails, switching nested_has_many_through to the gem version