Downgrade to berkshelf stable, since 3.0.0 beta is problematic

This also includes an updated `Gemfile.lock` tested with berkshelf 2.0.10.