Update to Cascalog2
Merge branch 'master' of github.com:ifesdjeen/cascading-cassandra

Conflicts:
	project.clj