Added timeout option and test to test new timeout parameter, added requestFail assertion.

Conflicts:
	lib/node-http-proxy/http-proxy.js
	test/http/http-test.js
	test/macros/http.js