Extract the device id and token id from the access token when autheniticating users

Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events

Pushers branch (with fixes)

Conflicts:
	synapse/handlers/events.py
	synapse/server.py

Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).