Merge branch 'master' of https://github.com/JFreegman/toxic
Mention av

Signed-off-by: Sean Qureshi <sean@tox.im>
Merge branch 'master' of https://github.com/stqism/toxic
a few fixes