1) Initial commit of conversion to using Guice modules for bootstrapping.  Things don't actually completely work yet.
1) Initial commit of conversion to using Guice modules for bootstrapping.  Things don't actually completely work yet.
1) Make tests work and continue trying to make the DruidMaster start up with just Guice
1) Inject IndexingServiceClient
2) Switch all the DBI references to IDBI
1) Fix DatabaseSegmentManager so that Unit Test passes
1) Introduce Jetty 8
2) Fix up modules based on exceptions at startup for MasterMain
1) A bunch more changes to make things actually run.  Not quite done, but close!
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
1) Configuration fixes, slowly gonna make the MasterMain actually start up!
correct segment path for hadoop indexer
Merge branch 'master' into worker-resource