colorize PK + clustering differently
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910
Merge branch 'cassandra-2.1' into trunk
fix build on os x
Merge branch 'cassandra-2.1' into trunk