Make cql3 word count executable
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make cql3 word count executable
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Configurable client timeout for cqlsh.

patch by Ryan McGuire; reviewed by Mikhail Stepura for CASSANDRA-7516
Merge branch 'cassandra-2.1' into trunk
Add listen_interface and rpc_interface options
patch by Matt Kennedy; reviewed by Tupshin Harper and jbellis for CASSANDRA-7417
Merge branch 'cassandra-2.1' into trunk
Fix range merging when DES scores are zero
patch by thobbs; reviewed by jbellis for CASSANDRA-7535
merge from 2.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk