add additional QCD systematic tail-fits, don't fit 7TeV e-tau QCD in btag, fix behaviour of datacard copying
Merge branch 'tmp' into tail-fitting

Merging changes into upstream HEAD
Conflicts:
	scripts/addFitNuisance.py