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

AUTHORS.rst

CHANGES.rst

CONTRIBUTING.rst

README.rst

contrib/vertobot/config.yaml

demo/start.sh

synapse/app/homeserver.py

synapse/appservice/__init__.py

synapse/appservice/api.py

synapse/appservice/scheduler.py

synapse/config/appservice.py

synapse/config/homeserver.py

synapse/config/registration.py

synapse/handlers/__init__.py

synapse/handlers/appservice.py

synapse/handlers/presence.py

synapse/metrics/__init__.py

synapse/rest/appservice/__init__.py

synapse/rest/appservice/v1/base.py

synapse/rest/appservice/v1/register.py