Unify indentation to 4 spaces.
Merge branch 'indentation' into issue119b

Conflicts:
	urllib3/fields.py
Simulate a standards-compliant web server.

This is an ugly work-around for facebook/tornado#868: we override one of
their internal functions, hoping that they don't decide to change its
semantics.