Updated to cassandra 2.1 and dsc21
Merge pull request #2 from rjkernick/master

Updated to cassandra 2.1 and dsc21