Merge pull request #671 from Kinematics/4.1-dev

GearSwap: Change method of handling user file includes.
GearSwap: Resources has res.zones.  Use that instead of local parsing.