Merge branch 'master' into pldi13

diff --combined main.cc
index 635b8da70bc213e3db6524c964e78301b1b28ebf,8a17a18e50d718324662e178f6496dec58fbbe00..e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb
--- 1/main.cc
--- 2/main.cc
+++ b/main.cc
@@@ -23,6 -23,9 +23,9 @@@ static void param_defaults(struct model
  }
  
  static void print_usage(struct model_params *params) {
+       /* Reset defaults before printing */
+       param_defaults(params);
+ 
        printf(
  "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
  "\n"
@@@ -72,10 -75,8 +75,10 @@@ static void parse_options(struct model_
                        break;
                }
        }
 -      (*argc) -= optind;
 -      (*argv) += optind;
 +      (*argv)[optind - 1] = (*argv)[0];
 +      (*argc) -= (optind - 1);
 +      (*argv) += (optind - 1);
 +      optind = 1;
  
        if (error)
                print_usage(params);