Remove shuffle/taketoken

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-1.2' into cassandra-2.0