Merge pull request #3 from heiko-braun/master

Update to cassandra trunk (3.0.0-SNAPSHOT)