Doc edits
Merge branch 'master' of https://github.com/mikera/matrix-api.git