Merge pull request #263 from daenney/remove-puppet-27