Reverting back to upstream state.

This reverts commit 7051392b436db3904ddfed8ae58f802527ac0182.
Merge branch 'master' of https://github.com/jorymil/puppet-ucarp

Right now, just trying to get my repository back to the upstream state
to avoid merge conflicts.