Downstream changes from @jfwood.
Add berkshelf support.