Add Gemfile.lock
Merge remote-tracking branch 'upstream/master'

Merging in latest updates from ole-regress in
anticipation of merging this fork back into main repo.