Fix adding threepids to an existing account

Fix the size reported by maxrss.

Various bug fixes to crypto.keyring

Conflicts:
	setup.py

Add instructions for upgrading setuptools for when people encounter a…

Add instructions for upgrading setuptools for when people encounter a message "mock requires setuptools>=17.1"

Allow users to redact their own events

Ignore development virtualenv and generated logger configuration as well.

Signed-off-by: Stanislav Nikitin <pztrn@pztrn.name>

Use the version of "matrix-angular-sdk" hosted on pypi

Clean up scripts/

Federated servers still need to delegate authority to owning servers

Swap out bcrypt for md5 in tests

Conflicts:
	synapse/handlers/_base.py

Conflicts:
	synapse/handlers/auth.py
	synapse/python_dependencies.py
	synapse/rest/client/v1/login.py