My latest versions
changes to code for plotting data-driven QCD estimate
crab.cfg minor changes
minor change
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoostedTauAnalysis/TauAnalyzer/src/TauAnalyzer.cc
	BoostedTauAnalysis/TauAnalyzer/test/Plot.C
	BoostedTauAnalysis/TauAnalyzer/test/copyAll.sh
	BoostedTauAnalysis/TauAnalyzer/test/formatPlots.C
	BoostedTauAnalysis/TauAnalyzer/test/generateDYJetsToLLTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateDataTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateJobFiles.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateQCDBMuTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateQCDBTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateQCDTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateSingleTopTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateTTJetsTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateWJetsToLNuTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateWNJetsToLNuTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateWZTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateWh1TauAnalyzerCfg.sh
	BoostedTauAnalysis/TauAnalyzer/test/generateZZTauAnalyzerCfgs.sh
	BoostedTauAnalysis/TauAnalyzer/test/submitAll.sh
	BoostedTauAnalysis/TauAnalyzer/test/tauanalyzer_WNJetsToLNu_Wh1_template_cfg.py
	BoostedTauAnalysis/TauAnalyzer/test/tauanalyzer_data_template_cfg.py
	BoostedTauAnalysis/TauAnalyzer/test/updateVersion.sh
	BoostedTauAnalysis/TauSkimmer/test/crab.cfg
	BoostedTauAnalysis/TauSkimmer/test/multicrab.cfg
	BoostedTauAnalysis/TauSkimmer/test/tauSelectionSkim_data.py
SSFilter added
Merge pull request #9 from friccita/master

Our latest merge