112 rearrange hierarchy

Minor fixes and improvements to the Vagrantfile
Does one actually need the `deb-src` reference?