Moved some stuff around, rearranged 'vagrant up' order

Attempting to get a single 'vagrant up' working by moving repository install
steps in shell provisioner instead of Puppet provisioner.  Moved puppetdb to
last sequence for boot.