Merge branch 'develop' into markjh/pushrule_stream

MANIFEST.in

README.rst

jenkins-flake8.sh

jenkins-postgres.sh

jenkins-sqlite.sh

jenkins-unittests.sh

jenkins.sh

scripts/synapse_port_db

synapse/app/homeserver.py

synapse/config/api.py

synapse/config/homeserver.py

synapse/config/repository.py

synapse/handlers/_base.py

synapse/handlers/auth.py

synapse/handlers/directory.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/profile.py

synapse/handlers/receipts.py