Update new_sm datacard scheme

- remove 1.23 norm shift on diboson for e-mu in 0jet categories
- Set current baseline shape aliases for e-mu vbf categories
- add method "4" for 1jet_high_mediumhiggs category - as method 3
  but uses inclusive->category efficiency for QCD
- for vbf categories use W+jets shape with full cat. selection but
  tau iso < 10 for the shape