fix ssh.timout namespace
Merge branch 'timeout' into integration

Conflicts:
	lib/chef/knife/vagrant_server.rb