Moving everything into parent dir
Updating setup and Vagrant file

now that puppet stuff isn't in puppet sub folder
Adding bootstrap code to README