rspec changes

Add changes that seem required for modern rspec/rspec-puppet versions. It also includes a fix for the two stopped tests failing on #78