Move to a single Puppet provisioner run, removing duplicate packages
Stop trying to make a permissions change that Vagrant will just override
Only do the apt-get update/install puppet routine if we have a suitably old version of puppet
Merge pull request #79 from markjaquith/issue/single-puppet-run

Puppet provisioning improvements