can assert on non-block arguments when method is called with a block

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

Conflicts:
	lib/rspec-spies.rb
	spec/rspec-spies_spec.rb