move test/acceptance to test/acceptance_old
fixed broken link
Merge pull request #2593 from bennlich/patch-1

fixed broken link on configuration version page
[provisioner/chef]: Update base to fix typo.

It seems this was introduced by accident with #2281.
Merge pull request #2594 from johnbellone/patch-1

provisioner/chef: Update base to fix typo.
Merge branch 'master' of github.com:mitchellh/vagrant
Start acceptance test config stuff
providers/virtualbox: only clear shared folders if we have a VM
test/acceptance: set the VBOX_USER_HOME
update rake tasks for acceptance testing
Update README
Update gemfile for others
Merge branch 'f-acceptance'

This brings in the new acceptance testing style. See the README.
test/acceptance: don't have the context show up as a component
provisioners/shell: array args properly work
provisioners/chef: support proper counter for multiple chefs
provisioners/puppet: use unique directory for each definition
Fix testing if initctl exists

If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
providers/virtualbox: resume should wait for boot
Merge pull request #2596 from tmatilai/fix-initctl-test

guests/linux: fix testing if initctl exists