#101 #133 Fixed another scaladoc warning.
Merge branch 'b1.0' of github.com:datastax/spark-cassandra-connector into b1.0