upgrade of Vagrant & puppet based on CFM3 updates by @JonTheNiceGuy
Merge branch 'master' of github.com:HACManchester/frostbite