Updated vagrant environment for Windows puppet dev
merged local changes with remote