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
Merge branch 'batch-zk' into worker-resource
Merge branch 'master' into worker-resource
Merge branch 'master' into worker-resource
1) remove retry logic from RTR
2) simplify configs
3) introduce task resource
4) make worker versions match coordinator version by default
Merge branch 'master' into worker-resource
Merge branch 'master' into worker-resource

Conflicts:
	pom.xml
Merge branch 'master' into worker-resource
1) on bootstrap, load all initial data and do a compare with bootstrapped tasks, delete any that are extra out there
2) change autoscaling logic such that it only works with remote task runnrs
3) zk workers use their own status caches to determine what they are running
fix logs
Call TaskRunner.bootstrap immediately after starting it
Merge branch 'master' of github.com:metamx/druid into worker-resource

Conflicts:
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
Merge branch 'worker-resource' of github.com:metamx/druid into worker-resource
fix RTR comments
fix broken ut