Prepare release 1.0.5
Merge branch 'b1.0' of github.com:datastax/spark-cassandra-connector into b1.1

Conflicts:
	README.md
	project/Settings.scala
Prepare release 1.1.1.
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt