Won't serve html
Added prepend tag to make pages display.
Converted links, sans space to slash
Replaced spaces with dashes
made layouts work
Merge pull request #240 from rjurney/guice

Working import, sans tables
Updated config to create tables.
Merge pull request #241 from rjurney/guice

Updated config to create tables.
broker needs to announce itself in service discovery
Merge branch 'guice' of github.com:metamx/druid into guice
fix broken master console
1) Remove snapshots
Merge branch 'master' into guice

Conflicts:
	client/pom.xml
	client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java
	indexing-common/pom.xml
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java
	realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
	realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
	server/src/main/java/com/metamx/druid/BaseServerNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
Update versions of poms and make IncrementalIndexStorageAdapterTest compile
Fix RealtimePlumberSchool.setQueryExecutorService() to actually use its argument
Reapply "fix regex and assign random user ids" from Xavier
Reapply Fix for NoSuchElementException that happens in IncrementalIndex when some columns are null
workaround for broker to plug in extensions
Merge branch 'guice' of github.com:metamx/druid into guice
Merge pull request #242 from metamx/guice

Druid version 0.6.0