bug fixes re btagging
Merge branch 'master' of github.com:encorelab/CommonKnowledge