Update guava to 15.0
Merge branch 'cassandra-2.0' into trunk
update version to 2.1