Rewrite/improve the query builder
Update to Cassandra 1.2.0 final