Merge pull request #673 from Kinematics/4.1-dev

GearSwap: Resources has res.zones.  Use that instead of local parsing.
GearSwap: Add the returned error as part of the error message when appropriate.