latest changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoostedTauAnalysis/TauAnalyzer/src/TauAnalyzer.cc
	BoostedTauAnalysis/TauAnalyzer/test/Plot.C
	BoostedTauAnalysis/TauAnalyzer/test/formatPlots.C
	BoostedTauAnalysis/TauAnalyzer/test/generateDataTauAnalyzerCfgs.sh
Merge pull request #10 from friccita/master

Our latest changes