Update docs, bump CQL3 version, correct CHANGES.txt for CASSANDRA-6395
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt