Merge pull request #1 from Erenzie/master

am I doing this right
Battle now strips whitespace, and fishbot understands cactus and cacti.
Merge pull request #3 from AppleDash/master