More on control variables

Merge branch 'mergeWithMaria' of https://github.com/pandolf/cmg-cmssw into ControlVariable
Latest version on Control Variables
cleanup + added mt2bb and pseudojet multiplicity