Allow rubbing any object against any touchstone even when the latter is known so only gems make sense. Also, propagate an earlier fix which allowed rubbing gold against known touchstones to the branch (it had been trunk only).