Merge pull request #66 from matrix-org/use-simplejson

synapse/crypto/keyclient.py

synapse/events/__init__.py

synapse/federation/persistence.py

synapse/federation/transport/server.py

synapse/handlers/federation.py

synapse/handlers/room.py

synapse/http/client.py

synapse/http/matrixfederationclient.py

synapse/push/__init__.py

synapse/push/pusherpool.py

synapse/python_dependencies.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/presence.py

synapse/rest/client/v1/profile.py

synapse/rest/client/v1/push_rule.py

synapse/rest/client/v1/pusher.py

synapse/rest/client/v1/register.py

synapse/rest/client/v1/room.py

synapse/rest/client/v2_alpha/filter.py