first pass on a working Vagrantfile
Merge branch 'master' of github.com:gdamiani/vagrant-puppet

Conflicts:
	Vagrantfile