Merge pull request #215 from roger-wolf/master

Modifications made fro testing Andrew's new merging
Merge pull request #216 from roger-wolf/master

change of configuration for CMS_eff_b and CMS_fake_b in uncertainty mode...
adding a description to use Andrews new merging to protocol
adding one more degree of robustness for option stable to obtain a hammer that can slay nearly everything
this is a config that maximizes merging for em