Get pedant changes for rspec 3
Merge branch 'mcquin/rspec-3' of github.com:opscode/chef into mcquin/rspec-3