Update for Puppet 3.x

Resolves all Puppet 3.x related issues.