site.pp cleanup for puppet. Still trying to get the system to reliably built straight from github with two vagrant commands (install plugin and then vegrant up) while also supporting running in deployment