Change gym into poké in tileset 1 (and accidentally fudge 0)
Fix the VWF's interaction with substrings.
Merge pull request #37 from Sanky/master

More vwf fixes.