sync Gemfile{,.lock} with main repo
Merge pull request #481 from rolandwalker/gemfile_sync

sync Gemfile{,.lock} with main repo