Various changes for Debian and virtualbox VM
Merge branch 'master' of github.com:tombamford/puppet