fixed bug with times called implementation that did not allow multiple assertions on different arguments
Merge pull request #1 from sharespost/d86920d265a4313bd3191d46102faef1aabf1592

Can now assert against multiple method calls with different arguments
fixed bug whereby regexes were not being properly matched
can assert on non-block arguments when method is called with a block

Conflicts:
	lib/rspec-spies.rb
	spec/rspec-spies_spec.rb
Fix Bundler deprecation warning.
Add Travis CI support
Merge pull request #23 from MDaubs/update-appraisals

Run test suite against three most-recent versions of RSpec
Merge pull request #18 from sharespost/reset_stubs_on_class_methods

Reset stubs on class methods
Rename Appraisal gemfiles
Merge pull request #19 from MDaubs/received-x-times

Mimic RSpec's exactly(x).times matcher
Manually merge regex bug fix - PR was not mergable.

Conflicts:
	spec/rspec-spies_spec.rb
Manually merge #21, non-block arguments fix.

Conflicts:
	lib/rspec-spies.rb
	spec/rspec-spies_spec.rb
Version bump to 2.1.4
Add 'now available in RSpec' info to README.
Fix formatting in README
Merge pull request #24 from nicholaides/patch-1

Fix formatting in README
Use __send__ instead of send to avoid collision
Merge pull request #26 from idrozd/master

Fixed "send" collision