Revert "Switch to my own fork of puppet-puppet"

This reverts commit 2223062665da70a338e70eef54f2f8e0a136c945.