Cassandra

Mostly just small cleanup stuff.  A little bit of refactoring in CassandraDataRequestAdapter to change the result type of some private methods, and remove some arguments that weren't being used.