added a different Vagrantfile
Merge branch 'master' of github.com:vecna/helpagainsttrack

Conflicts:
	Vagrantfile