Minor bugfixes (hopefully) to fix installation behavior and berkshelf issues.

* Back out change adding ||= to berkshelf key replacement as it was causing issues.
* Attempt to match the Chef dependencies more closely to avoid ruby gem installation issues