update to cassandra 1.2
add atomic batch mutate and trace next
Merge branch 'dev'

Conflicts:
	project.clj