Run puppet more like userdata

...and make maybe-upgrade.sh work, too.
Merge branch 'vagrantfile' into consul

Conflicts:
	Vagrantfile