Revert "merge DataMCType"
This has to be reverted, as it did nothing then to change back files which have been modified by the previous commit (merge code from Vladimir). Something went wrong

This reverts commit 99c78d61cc14067ac779800a662d77b73cf6ebbf.
fix bug with htautau_whzhtth
Merge remote-tracking branch 'upstream/master'
correct datamctype for h->wh/zh/tth, more flexible skimmingcuts, added jet tracks
fixed preselection & function isGoodTau
fixed typo for double electron preselection
first part of switching back to recoJets and implement new MVAMET recipe
implement MVA-MET for recoJets
add correct include for PUJetID
cleaning up and bug fixing
changed electron pt cut to 5GeV
Store reco::photons in tau cone and pions
remove .h~
btags are now calculated from PFJets instead of CaloJets
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
fix Vladimir's fix
Merge remote-tracking branch 'upstream/Production_2014_Jan_21'
Merge pull request #4 from anehrkor/master

minor fix for compiling TauNtuple