Remove defunct relocate tests
Add cassandra-2.1.0_test-select.cfg
Merge branch 'master' into python-driver

Conflicts:
	consistent_bootstrap_test.py
	taketoken_test.py