Changed the order of the paramaters that sat-variables-from-cmdline takes to be more convenient for replacing defines.
Moved set-variables-from-cmdline from args_fold_test to scheme_util_general.