put tau+jets to non-semilep category
merge
mergeMerge branch 'master' of https://github.com/rappoccio/usercode