Making --skip-master-archive the default, and adding a --enable-master-archive option.