correct datamctype for h->wh/zh/tth, more flexible skimmingcuts, added jet tracks
fixed preselection & function isGoodTau
fixed typo for double electron preselection
changed electron pt cut to 5GeV
Store reco::photons in tau cone and pions
remove .h~
merge attempt 1 with Vladimir
Merge branch 'master' of https://github.com/bkargoll/TauDataFormat into
bkargoll-master

Conflicts:
	TauNtuple/src/TauNtuple.cc
Merge pull request #3 from anehrkor/master

merge for next production