README formatting
Merge branch 'master' into room-and-user-accounts