Oops, I removed this param.
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
Merge branch 'develop' into http_client_refactor
Merge pull request #20 from matrix-org/http_client_refactor

Http client refactor
Fix pep8 and pyflakes warnings
Merge branch 'develop' into pushers