Updaded box URLs and change Vagrant names to match hostname
Removed dashes (Vagrant HATES them! :)
Finsihed addeing puppetmaster and puppet client settings