Merge pull request #1125 from juanriaza/master

HTTPDigestAuth: missing algorithm field
Merge remote-tracking branch 'upstream/master'

Conflicts:
	requests/sessions.py
Add missing import
Refactor prepare_hooks()
Comment & replace something that keeps disappearing
Only call the hook once.
Moves num_401_calls counter to HTTPDigestAuth
Pass kwargs to json.loads

Not all JSON is created equally. This commit
addresses when users want to take control of the
json decode process.
Merge pull request #1132 from sburns/jsonkwargs

Pass kwargs to json.loads
remove silly assert
Merge pull request #1134 from steveklabnik/remove_silly_assert

remove silly assert
introduce a test for link headers.
Remove a test per @kennethreitz in IRC

The test suite is moving from the httpbin pattern (which hits the
network) to depending on the request.prepare method (which doesn't).
Here's a start ...
Merge pull request #1136 from steveklabnik/test_link_header

introduce a test for link headers.
Merge pull request #1137 from whit537/unperson_test

Remove a test per @kennethreitz in IRC
Merge branch 'master' of git://github.com/kennethreitz/requests

Conflicts:
	test_requests.py
Test for cookie parameters.
Merge pull request #1099 from sprt/master

Make hooks work with prepared requests
purported py2.6 support for cookies test.
Remove default Content-Length from GET requests.

Fix #1051.