Upgrading Cassandra driver from 1.0 to 2.1.
Minor change.
Merge remote-tracking branch 'origin/master'