So how is everyone handling the cgminer integration?  

The https://github.com/bitmine-ch/cgminer branch that Zefir put so much excellent work into is a bit deviant from the https://github.com/ckolivas/cgminer I'd been using.  There are features in the ckolivas version that I'd like to use, so what's the standard procedure here?  Fork/branch ckolivas version, integrate the A1 bits, then see what it takes to pull and merge it back?