catch up with erlang_cassandra changes
Merge pull request #1 from sanmiguel/master

catch up with erlang_cassandra changes