Removed Chocolatey from base build. Updated Puppet version to 3.6.1 - latest version and added it to base build in place of Chocolatey