Updates from TAU discussion
- change the Electron and Muon EnergyScale corrections to use a single combine name for all decay modes
- rename combine names for VSe and VSmu as fake rates rather than efficiencies
- remove gen-match jets uncertainties
- remove decay mode 2 uncertainties
- remove the ditauvbf trigger uncertainties
- decorrelated trigger uncertainties by year (different combine names) [currently set both 2016preVFP and 2016postVFP to the same, called 2016]