fixing Vagrant multi-VM setup for heartbeat
Merge branch 'master' of github.com:mmarschall/chef-repo

Conflicts:
	Vagrantfile