reorganizing plots
filename has lepton channel + small fixes
Merge remote-tracking branch 'origin/master' into plots_25_AN

Conflicts:
	control_plots/all_plots/make_all_plots.py