Merge remote-tracking branch 'upstream/master'

* upstream/master: (99 commits)
  Version 1.13.0
  Ensured WebMock doesn't disconnect a previously started Net::HTTP connection upon request. This fixed Net::HTTP::Persistent compatibility.
  Fixed spec syntax to be compatible with Ruby 1.8
  Version 1.12.3
  Ensured httpclient multipart requests don't blow up.
  Use #request_uri instead of #path to get path with query params from Net::HTTP request.
  Don't run tests for em-http-request anymore on Travis. Does anyone still use em-http-request 0.3?
  Add waffle.io badge to readme
  Version bump to 1.12.2
  Improved test name.
  Fixed issue with request.path when Addressable::URI is passed to #request instead of URI with Ruby 2.0.
  fix query parametter with can't dup Object
  Updated version to 1.12.1
  Minitest < 5.0 compatibility.
  Version update to 1.12.0
  Dropped support for Ruby 1.8.6 and added support for Ruby 2.0.0
  Ignored ruby-version and ruby-gemset from git
  Removed rvmrc from the repo
  Wrong name in credits.
  Added rack.session.options rack key to WebMock::RackResponse for Rails 4 compatibility
  ...