Update versions for 2.0.11
Update news/version for 2.1.1
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	build.xml
	debian/changelog