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

.gitignore

CHANGES.rst

MANIFEST.in

README.rst

UPGRADE.rst

VERSION

contrib/graph/graph2.py

contrib/jitsimeetbridge/jitsimeetbridge.py

contrib/vertobot/bridge.pl

demo/start.sh

docs/turn-howto.rst

scripts/check_auth.py

scripts/federation_client.py

scripts/make_identicons.pl

setup.cfg

setup.py

static/client/register/index.html

static/client/register/js/jquery-2.1.3.min.js

static/client/register/js/recaptcha_ajax.js

static/client/register/js/register.js