Fix error in allowing types to be searched using a word other than "type"
Remove stray character
Merge pull request #335 from TalkTakesTime/master

Fix error when searching for type, and change isShowAll to showAll
Gen 3: Small file cleanup
Gen 3: Delete getDamage override
Gen 3's getDamage is a clone of an older Gen 5's version.
Delete it for now, since it has no reason to exist until differences
in that function have to be added for gen 3.
Merge remote-tracking branch 'upstream/master'