Use environment file to populate Vagrant config
Don't try to install Puppet every single time.
Don't hardcode IP for proxy. Rely on environment.
Ensure etcd discovery token is set

Bail out if it's not already set in the VM and not available in the
environment. If it'se available in the environment inject it into the
VM.

Provide newtokens.sh to fetch new tokens.
Run puppet more like userdata

...and make maybe-upgrade.sh work, too.
Sync lib and site.pp
Stop running tests from Vagrantfile
Merge pull request #69 from sorenh/vagrantfile

A bunch of Vagrantfile improvements