More cleanup

Sorting out the Vagrant/puppet configuration,
Removed most organization and dataset references