Merge pull request #2 from Pichu0102/dev

Dev
Merge pull request #3 from Pichu0102/master

Finally added magic word functionality.
fix bug where all messages triggered magicwords
Merge pull request #3 from shaldengeki/master

Pull from upstream to dev