Simplified vagrantfile, added self-updating puppet service
merged changes