making config file merging and non-merging friendly. Also adding bbb for 1jet_medium in et and mt
Merge pull request #224 from rcl11/merging_fixes

Changes to config for bbb uncerts to work with merging