Upgrade java cassandra driver to 2.0.4. Fixes #171.
Merge pull request #172 from datastax/wip-171-upgrade-java-driver

Upgrade java cassandra driver to 2.0.4. Fixes #171.
Add missing CHANGES.txt entry for #171
Merge branch 'b1.0' of https://github.com/datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt