catching exception if hadd file is in the way (so no crash, only post-processing), now fast option doesnt remove duplicates, non-fast option does
Cleaned definition of control variables

Merge branch 'mergeWithMaria' of https://github.com/pandolf/cmg-cmssw into ControlVariable
Little fix