Wrapping up CompStrm-1

Having moved the calendaring system to G2, there's not a lot left to do in CompStrm-1. The Wiki code is done, if not finalized. And I'm turning my attention to porting and general cleanup.