enable vnodes by default (CASSANDRA-5869)
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5869
merge from 2.0.0
Merge branch 'cassandra-2.0' into trunk