Merge branch 'develop' of github.com:matrix-org/synapse into develop

UPGRADE.rst

cmdclient/console.py

cmdclient/http.py

database-prepare-for-0.2.0.sh

docs/client-server/OLD_specification.rst

docs/client-server/swagger_matrix/api-docs-directory

docs/client-server/swagger_matrix/api-docs-events

docs/client-server/swagger_matrix/api-docs-login

docs/client-server/swagger_matrix/api-docs-presence

docs/client-server/swagger_matrix/api-docs-profile

docs/client-server/swagger_matrix/api-docs-registration

docs/client-server/swagger_matrix/api-docs-rooms

docs/server-server/security-threat-model.rst

docs/specification.rst

experiments/cursesio.py

experiments/test_messaging.py

graph/graph.py

scripts/copyrighter.pl

scripts/gendoc.sh

setup.py