Avoid running in to https://github.com/rspec/rspec-expectations/pull/670

Fixes #27
Merge branch 'develop' into error_handler_work

Conflicts:
	spec/ruby_ami/client_spec.rb