Add a request-id to each log line
Pep8 and a few doc strings
Merge branch 'develop' into request_logging

Conflicts:
	synapse/config/logger.py
Remove unused 'context' variables to appease pyflakes
Merge branch 'develop' into request_logging

Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
Merge pull request #13 from matrix-org/request_logging

Request logging