Merge pull request #20 from friccita/master

Latest merge: dz cuts, uncertainty calculations, and more
fixed compiler warnings and removed dR(soft muon, HPS tau) cut
updated for new location os Wh1 ma = 5 GeV dataset
updated content of regions C and D MC skim cfg to be in line with regions A and B
added tau energy shift producer to path
removed MET smearing from MET and MET uncertainty calculation
changed MET collection to be explicitly the one calculated with the MET uncertainty tool
reverted MET collection to one ending in PFlow for backwards compatibility
removed Type 0 corrections for backwards compatibility
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoostedTauAnalysis/TauAnalyzer/src/TauAnalyzer.cc