show the host and port when failing to connect
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
Merge branch 'cassandra-2.0' into trunk