fixed trigger looping
corg-kuns fixes
Merge branch 'master' of https://github.com/hjpa/sadbot