SYN-153: Fix formatting of federation error message
Merge branch 'master' into develop
Merge branch 'master' into develop
CaptchaServerHttpClient should extend the base, not matrix http client.
Refactor the HTTP clients a little.
Oops, I removed this param.
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
Fix pep8 codestyle warnings
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
SYN-58: Allow passing explicit limit=0 to initialSync to request no messages at all; missing still implies default 10
Return 404 M_NOT_FOUND when trying to look up a room alias that doesn't exist
rst bugs
typos
SYN-163: Add an order by rowid to selects.

This should fix the bug where the edges of the graph get returned in a
different order than they were inserted in, and so no get_event no
longer returned the exact same JSON as was inserted. This meant that
signature checks failed.
We don't always want to Auth get_persisted_pdu
Ask for any auth events that we don't have