Rename clustering keys to clustering columns in doc
Merge branch 'cassandra-1.2' into cassandra-2.0