Fixes #91

ccm was running into CASSANDRA-7411 and CASSANDRA-7649 (more importantly). See Issue #91 for more details.