I started this from our branch and brought it as close back to the mainline luvit and libuv.  I can move it back to the mainline now as this is becoming less of a Work in Progress.