Merge branch 'master' of https://github.com/cms-analysis/HiggsAnalysis-HiggsToTauTau
small bug fixes
Merge pull request #510 from ffrensch/master

updates and fixes