support for chef solo environments, upcoming in chef 11.6
Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support

Conflicts:
	plugins/provisioners/chef/config/chef_solo.rb