Removed useless line.
General cleanup

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