Updated to cassandra 2.1 and dsc21