corrected patType1CorrectedPFMetPFlow in tauanalyzer config file; fixed typo (missing ') in generateNonIsoWData script
minor changes
Merge remote-tracking branch 'upstream/master'; added Rachel's MET and btag scale factor machinery

Conflicts:
	BoostedTauAnalysis/TauAnalyzer/test/formatPlots.C
	BoostedTauAnalysis/TauAnalyzer/test/tauanalyzer_WNJetsToLNu_Wh1_template_cfg.py
	BoostedTauAnalysis/TauAnalyzer/test/tauanalyzer_data_template_cfg.py
Merge pull request #19 from friccita/master

A few more bugs fixed