Support for nock options, tests
Merge remote-tracking branch 'origin/nock_options_support' into nock_options_support

Conflicts:
	lib/describe-fixture.js
	lib/recorder.js