Merge branch 'rspec3_test' of github.com:tuxmea/rspec-puppet into rspec3_test

Conflicts:
	lib/rspec-puppet/matchers/run.rb
Merge branch 'rspec3_test' of github.com:tuxmea/rspec-puppet into rspec3_test