remove shuffle bat
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	bin/cassandra-shuffle.bat
Ninja: remove buggy test assertion from 2.1

This was fixed by CASSANDRA-7390, but that fix starts with Cassandra
3.0.
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	test/unit/org/apache/cassandra/service/MoveTest.java