Merge branch 'develop' into markjh/twisted-15

AUTHORS.rst

CHANGES.rst

MANIFEST.in

README.rst

demo/clean.sh

demo/start.sh

synapse/__init__.py

synapse/api/auth.py

synapse/api/constants.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/captcha.py

synapse/config/homeserver.py

synapse/config/metrics.py

synapse/config/repository.py

synapse/config/saml2.py

synapse/config/server.py

synapse/config/tls.py

synapse/crypto/context_factory.py

synapse/crypto/keyring.py