Minor tweaks.
Merge branch '2.0' of https://github.com/jbisso/cassandra-samples into 2.0