make compatible with cassandra 2.0
Merge branch 'cassandra-2.0' into 2.0-coursera