Cleanup and simplifications
Documentation and naming improvements

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java