Merge branch 'batch-zk' into worker-resource
Merge branch 'master' into worker-resource

Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
fix up configs
Merge branch 'master' into worker-resource

Conflicts:
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
Merge branch 'batch-zk' into worker-resource

Conflicts:
	pom.xml
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
Merge branch 'bug-fix' into worker-resource
Building a correct segment path for HDFS
moved getHdfsStorageDir() to DataSegmentPusherUtil, extended test
Merge branch 'master' of github.com:metamx/druid
Merge branch 'batch-zk' into worker-resource
Fixed hanging ssh bug FINALLY
correct segment path for hadoop indexer
Merge branch 'master' into worker-resource
Make upload script executable
Merge branch 'master' of github.com:metamx/druid
Made webstream example work.
Merge branch 'master' of github.com:metamx/druid
Merge branch 'master' into worker-resource
Merge pull request #185 from rjurney/test-harness

Fixed hanging ssh bug FINALLY
Merge pull request #186 from rjurney/master

Made upload.sh executable