Minor spec tweaks.
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse
fix embarassing bug where in-progress messages get vaped when the previous one gets delivered
Bump version and change log
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse

Conflicts:
	webclient/room/room-controller.js
Add note about glare support
Spellcheck
Merge branch 'master' of github.com:matrix-org/synapse into develop