Update for Rails 4.2
Merge pull request #140 from thetallgrassnet/rails-4.2

Update for Rails 4.2