Latest iteration of my personal illustrious merge, seemed quite nice so I'll share.

I use res_multistep/beta and ~32 steps, 2.5CFG, and I don't much care what you do, whatever works is good, have fun.