#236 Upgrade to Cassandra 2.1.0 and Spark 1.1.0.

Branched off b1.1