Add vagrant vm customizations.
Merge remote-tracking branch 'origin/vagrant-customize' into chef-11