Ensure we preserve RUBYLIB in our cucumber environment
Actually - leave Gemfile.lock out of .gitignore
Merge remote-tracking branch 'upstream/master'