Updated categorization machinery for di-photon MVA
Update vbf tree scripts