Merge branch 'master' into moarunittests

Conflicts:
	client/src/main/java/com/metamx/druid/http/BrokerMain.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/Worker.java
	merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
Merge branch 'master' into moarunittests

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/Worker.java
	merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java
timeseries for druid + unit tests
Merge branch 'moarunittests' into misc

Conflicts:
	client/src/main/java/com/metamx/druid/http/BrokerMain.java
allow hadoop druid indexer to register registererers
change hadoop indexer to be node based
add register abilities to mapper
fix setters for hadoop node
register registererers in the config
fix bug with jackson conversion
set default version if one is not set
fix last commit with version
working indexer with registererers
Merge pull request #20 from metamx/autoscaling

Improvements to distributed indexing service and auto scaling
fix compile breakage introduced by scaling strategies
Merge branch 'master' into moarunittests

Conflicts:
	client/src/main/java/com/metamx/druid/http/BrokerMain.java
fix some merge issues
add missing header
Merge branch 'master' into misc

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
Merge branch 'moarunittests' into misc

Conflicts:
	client/src/main/java/com/metamx/druid/http/BrokerMain.java