Cassandra 2.0.1

Unit tests should now all pass.  The feature branch is a misnomer as the branch now requires C* 2.0.4.