Rebuild following the cql 3.0 apocalypse. Scamandrios's query escaping
function is completely inadequate right now, so hack around it by
hand-building the tiny set of queries we need for model persistence.

Also, broke the ground for support for adding set & map types to polyclay.
This work requires tip of tree on the polyclay master branch.