#236 Upgrade to Cassandra 2.1.0 and Spark 1.1.0 

This is built off b1.1 branch and will need to be merged back to that.