Merge branch 'master' of https://github.com/audiohacked/hkperlbot
Revert 233ee55..341d5a6

This rolls back to commit 233ee550f751b47859509a8fb05e26ba7ad2dd2a.
Revert 4ded460..c417d98

This rolls back to commit 4ded4602519d0341465ab668fa59746a63939133.