update constraints sets
remove unneeded test
change back to using 1.5 instead of DMh for Higgs constraint
changes to user files