Update Gemfile and remove Gemfile.lock

This bumps berkshelf to 2.0.18 since we're getting failures w/ 2.0.10.

Change-Id: I3acaee40cf6c1284d0db33c643c460f03efefb51
Related-Bug: 1338972