autojoin

blacklist/whitelist fix
autojoin

blacklist/whitelist fix
autojoin

cleaned up stuff a little bit
Merge pull request #393 from r3g1stry/master

autojoin