Fixes recommended by phinze for #2333
fixing error in comment #2333
Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333

Conflicts:
	plugins/guests/ubuntu/cap/change_host_name.rb