Merge pull request #237 from cmurphy/rspec-puppet-2