Update for recent cassandra
Merge pull request #11 from keck/master

Minor update needed for cassandra 1.2.x