All the cql2 tests now pass.
Just three failing thrift tests to rewrite!