Fix a stackoverflow in Cluster init
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/src/main/java/com/datastax/driver/core/Cluster.java