r/m Test.iml
Merge branch 'cassandra-2.0' into trunk
remove dead code
Merge branch 'trunk' into work