upgrade rspec dep
Clean up RSpec deprecation warnings around mock()/stub()
Add acceptance dir to test_files in gemspec
Fix deprecation warnings in friendly_errors_spec

Also catch a test that should've been failing and wasn't
Fix warnings around redefining ARGV in cli_spec
whitespace
Make Puppetfile :git compatible with all the other tools