Merge pull request #129 from matrix-org/key_distribution

synapse/api/urls.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/homeserver.py

synapse/config/key.py

synapse/config/server.py

synapse/crypto/keyclient.py

synapse/crypto/keyring.py

synapse/rest/key/v2/__init__.py

synapse/rest/key/v2/local_key_resource.py

synapse/rest/key/v2/remote_key_resource.py

synapse/server.py

synapse/storage/__init__.py

synapse/storage/keys.py

synapse/storage/schema/delta/17/server_keys.sql