allow num_tokens to be unspecified, as described in the yaml
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk