Updated puppet scripts.
Updated puppetmaster.
Updated vagrantfile to point to the new location of the puppet scripts.
Removed puppet master submodule (this structure for puppet scripts just isn't working). Placed puppet scripts in a 'puppet' folder.