Made a few changes to vagrant and puppet scripts