diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,118 +1,135 @@
 Makefile$
 Makefile\.in$
 \.deps$
 \.libs$
 \.l[ao]$
 \.so$
 \.so\.
 \.o$
 ~$
 \.pyc$
 \.codereplace$
 \.orig$
 \.tar\.(gz|bz2)$
 ^autom4te.cache$
 ^config.herwig$
 ^config.log$
 ^config.status$
 ^configure$
 ^include/Herwig$
 ^Config/config.guess$
 ^Config/config.h$
 ^Config/config.h.in$
 ^Config/config.sub$
 ^Config/depcomp$
 ^Config/compile$
 ^Config/install-sh$
 ^Config/missing$
 ^Config/stamp-h1$
 ^Config/ar-lib$
 ^Contrib/make_makefiles.sh$
 ^Contrib/.*/.*\.(log|out|tex|run)$
 ^Utilities/hgstamp.inc$
 ^Doc/HerwigDefaults.in$
 ^Doc/refman-html$
 ^Doc/fixinterfaces.pl$
 ^Doc/refman.conf$
 ^Doc/refman.h$
 ^Doc/AllInterfaces.h$
 ^Doc/HerwigDefaults.rpo$
 ^Doc/Herwig-refman.tag$
 ^Doc/tagfileThePEG.tag$
 ^Doc/.*\.log$
 ^INSTALL$
 ^aclocal.m4$
 ^confdefs.h$
 ^conftest.c$
 ^conftest.err$
 ^include/done-all-links$
 ^libtool$
 \.dirstamp$
 ^src/hgstamp.inc$
 ^src/herwigopts.h$
 ^src/herwigopts.c$
 ^src/defaults/Analysis.in$
 ^src/defaults/Decays.in$
 ^src/defaults/decayers.in$
 ^src/herwig-config$
 ^src/.*\.(run|tex|out|log|rpo|spc|top|dump|dot|aux|pdf|ps|png|svg|hepmc|dvi)$
 ^src/Makefile-UserModules$
 ^lib/done-all-links$
 ^lib/apple-fixes$
 ^src/defaults/PDF.in$
 ^src/defaults/done-all-links$
 ^src/tune$
 ^src/Herwig$
 ^src/Herwig-cache$
 ^src/tests/.*\.(time|mult|Bmult|chisq)$
 ^src/Merging/test/*yoda
 ^src/Merging/test/Herwig*
 ^src/Merging/test/L*
 ^src/Merging/test/done-all-links
 ^src/Merging/done-all-links
 ^Tests/.*/.*\.(top|ps|pyc|info|dat|pdf|png)$
 ^Tests/.*\.(top|ps|pyc|info|dat|pdf|png|log|out)$
 ^Tests/.*\.(top|run|tex|mult|Bmult|aida|yoda)$
 ^Tests/Rivet-.*$
 ^Tests/.cache$
 ^Tests/Rivet/.*(EE|DIS|LHC|TVT|Star|ISR|SppS)-.*\.in$
 ^Tests/plots$
 ^Tests/Herwig$
 ^Tests/.*index.html$
+Tests/python/LowEnergy.py
+Tests/python/R.py
+Tests/python/make_input_files.py
+Tests/python/merge-DIS
+Tests/python/merge-EE
+Tests/python/merge-EE-Gamma
+Tests/python/merge-Fixed
+Tests/python/merge-GammaGamma
+Tests/python/merge-LHC-EW
+Tests/python/merge-LHC-Jets
+Tests/python/merge-LHC-Photon
+Tests/python/merge-TVT-EW
+Tests/python/merge-TVT-Jets
+Tests/python/merge-TVT-Photon
+Tests/python/mergeLowEnergy.py
+Tests/python/plot-EE
+Tests/python/rivet_check
 PDF/SaSPhotonPDF.cc
 ^Herwig\-
 ^Models/Feynrules/python/Makefile-FR$
 ^MatrixElement/Matchbox/External/MadGraph/mg2herwig$
 ^MatrixElement/Matchbox/Scales/MatchboxScale.cc$
 ^Utilities/Statistics/herwig-combinedistributions$
 ^Utilities/Statistics/herwig-combineruns$
 ^Utilities/Statistics/herwig-makedistributions$
 ^src/defaults/MatchboxDefaults.in$
 ^src/defaults/setup.gosam.in$
 ^src/Matchbox/LO-DefaultShower.in$
 ^src/Matchbox/LO-DipoleShower.in$
 ^src/Matchbox/LO-NoShower.in$
 ^src/Matchbox/MCatLO-DefaultShower.in$
 ^src/Matchbox/MCatLO-DipoleShower.in$
 ^src/Matchbox/MCatNLO-DefaultShower.in$
 ^src/Matchbox/MCatNLO-DipoleShower.in$
 ^src/Matchbox/NLO-NoShower.in$
 ^src/Matchbox/Powheg-DefaultShower.in$
 ^src/Matchbox/Powheg-DipoleShower.in$
 ^src/defaults/MatchboxMergingDefaults.in
 ^src/Matchbox/done-all-links$
 ^src/snippets/done-all-links$
 ^Utilities/XML/xml_test$
 ^Utilities/utilities_test$
 ^Utilities/versionstring.h$
 ^MatrixElement/Matchbox/External/MadGraph/mg2herwig.py$
 test\.(log|trs)$
 test-suite\.log$
 ^Config/test-driver$
 param_card\.dat$
 __all.cc$
 .ccR$
 ^tmp/*
 PDF/stamp-h2
 Tests/anatohepmc.txt
 Tests/hepmctoana.txt