Resolve conflicts
Bridging name for ulam EventWindow
Build system hacks
U-ify name conflicts
Continued driver tweak/devel