Merge pull request #7 from anehrkor/master

fixed HPSAgainstMuon discriminators
add non-3D PU reweighting, fix bug in 3D PU reweighting
added +-5% PUweights for studies of PU systematics
adding Mu+Tau MVA-MET
Merge remote-tracking branch 'bastian/master'

Conflicts:
	TauNtuple/interface/TauNtuple.h
	TauNtuple/src/TauNtuple.cc