Fix Berkshelf and pin versions in Gemfile

Berkshelf was unbound in the Gemfile, but still had the older 2.X
format in the metadata.  I pinned all the versions in the Gemfile and
updated the Berksfile to the new format