Add puppet repo to populate-workspace script
Merge branch 'master', remote-tracking branch 'origin'
Adding Vagrant to the sshallowedlogin list, otherwise it never sees it as booted
Merge branch 'master', remote-tracking branch 'origin'
Make the definition between a webnode and a raspberry pi
Make sure there's a .vim directory first