Updating to berkshelf2