Incorporate stephenrjohnson/puppetlabs-puppet fork