Added a basic vagrant/puppet config via puphpet
Moved vagrant stuff to a common subdir
Tweaking Vagrant config
Monkeypatching Puppet vHost template - not nice, but works for now