updates for Rails 5.0 and Ruby 2.1.5