Merge pull request #670 from Kinematics/4.1-dev

GearSwap: Refine status guards to be sure we get a valid new status.
GearSwap: Change method of handling user file includes.
New version does not require a table wrapper to be returned from the included file.