Added Vagrant

Also changed Base layout inheritance for more persistent results across
bundles