Upgrade rails
Merge pull request #12 from jabley/rails-3.2.18

Upgrade rails