Conflicts:
	synapse/handlers/_base.py

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

Check for an internationalised filename first

Support unicode attachment filenames

Make 'setup.py test' run tox

Merge erikj/user_dedup to develop

Allow tests to be filter when using tox

`tox` will run all tests
`tox tests.api.test_auth.AuthTestCase` will run just the tests in AuthTestCase

Don't loop over all rooms ever in typing.get_new_events_for_user

Add config option to specify where generated files should be dumped

Stop looking up "admin", which we never read

Remove completely unused concepts from codebase

Allow specifying directories as config paths

Removes device_id and ClientInfo

device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.

This doesn't remove the columns from the database, because that's
fiddly.