Add pre-puppet and post-puppet shell scripts
Update Vagrantfile for Vagrantfile API v2

Fixed Conflicts:
	Vagrantfile