MSC2033: Adding a device_id to /account/whoami#2033

turt2live merged 2 commits intomastermatrix-org/matrix-spec-proposals:masterfrom

travis/msc/whoami-devicematrix-org/matrix-spec-proposals:travis/msc/whoami-deviceCopy head branch name to clipboard