Attach response headers to error object
Merge branch 'master' into headers-on-error

Conflicts:
	lib/http-request.js
Merge pull request #227 from mostlyserious/headers-on-error

Attach response headers to error object