first pass at upgrading to Cassandra 2.1.1