Merge branch 'feature-2.0' into feature-2.0-lowe-legacy

.gitattributes

@@ -15,6 +15,8 @@ examples/lattice_numerical_fmssm_fmssmn.cpp export-ignore
 examples/switch_MSSM.cpp                    export-ignore
 
 model_files/BetaSM              export-ignore
+model_files/cCMSSM              export-ignore
+model_files/complexMSSM         export-ignore
 model_files/CMSSMFPIAbsolute    export-ignore
 model_files/CMSSMFPIRelative    export-ignore
 model_files/CMSSMFPITadpole     export-ignore
@@ -23,21 +25,29 @@ model_files/CMSSMGSLHybrid      export-ignore
 model_files/CMSSMGSLHybridS     export-ignore
 model_files/CMSSMGSLNewton      export-ignore
 model_files/CMSSMLowPrecision   export-ignore
+model_files/CMSSMMatchedAtMTDRbar export-ignore
+model_files/CMSSMMatchedAtMTPole  export-ignore
 model_files/CMSSMMediumPrecision export-ignore
 model_files/CMSSMHighPrecision  export-ignore
 model_files/CMSSMMassWInput     export-ignore
 model_files/CMSSMConvergenceTester export-ignore
+model_files/cSM                 export-ignore
 model_files/BLSMlightZp         export-ignore
 model_files/InertMSSM           export-ignore
 model_files/LHInputMSSM         export-ignore
 model_files/MDM                 export-ignore
+model_files/MRSSM2              export-ignore
+model_files/MSSMNoEWVEVs        export-ignore
+model_files/MSSMNoFVSLHA2       export-ignore
 model_files/minMSSM             export-ignore
 model_files/NoInputParameters   export-ignore
 model_files/NoYukawaMSSM        export-ignore
 model_files/NSM                 export-ignore
 model_files/rootMSSM            export-ignore
 model_files/YukawaCMSSM         export-ignore
 model_files/UnbrokenMSSM        export-ignore
+model_files/SMEWSBAtMZ          export-ignore
+model_files/SMHighScale         export-ignore
 model_files/SMHighPrecision     export-ignore
 model_files/SMnoGUT             export-ignore
 model_files/SMNoRGEs            export-ignore
@@ -50,16 +60,21 @@ models/fmssm                    export-ignore
 models/fmssmn                   export-ignore
 models/sm                       export-ignore
 models/smcw                     export-ignore
+models/SoftsusyMSSM             export-ignore
+models/SoftsusyNMSSM            export-ignore
+models/SoftsusyFlavourMSSM      export-ignore
 
 release                         export-ignore
 
 sarah/B-L-SM-lightZp            export-ignore
 sarah/InertMSSM                 export-ignore
 sarah/MDM                       export-ignore
+sarah/MSSMNoEWVEVs              export-ignore
 sarah/NoYukawaMSSM              export-ignore
 sarah/NSM                       export-ignore
 sarah/UnbrokenMSSM              export-ignore
 sarah/SMnoGUT                   export-ignore
+sarah/SM2                       export-ignore
 sarah/TensorCoupling            export-ignore
 
 src/SM.cpp                           export-ignore

.gitignore

@@ -61,6 +61,7 @@ models/**/
 !models/smcw/
 !models/SoftsusyMSSM/
 !models/SoftsusyNMSSM/
+!models/SoftsusyFlavourMSSM/
 
 model_files/*/LesHouches.out.*