Chef version upgrades and vagrant-berkshelf fix