Update Gemfile[.lock] for upstream rebase

Update these two files for testing against an upstream rebase.