Fix for subscriptions->messages wonkiness.
Fixes for three of mrcoolbp's issues
Merge pull request #315 from TheMightyBuzzard/quickfix

Fix for subscriptions->messages wonkiness.
Merge pull request #316 from TheMightyBuzzard/typos

Fixes for three of Bytram's issues
One typo fix from IRC