Merge pull request #1 from Socialery/master

i l u bby
changed a line for pwny's bot
updated emote to include parsing \\emotename
fixed a bug in emote matching
Merge pull request #1 from flare561/master

update