Allows use with Rails 4.
Changes Gemfile.lock.
Merge branch 'master' into retry