clean up realtime module and fix breakage in broker paths
refactor how server service discovery is done
fix lifecycle startup/stop ordering problem with discovery module and make druid able to load local extensions
fix spacing issues and other code review comments
Merge pull request #244 from metamx/guice-discovery

Refactor how server service discovery is done
Fix S3DataSegmentPuller retry bug
Merge pull request #245 from metamx/s3-retry-fix

Fix S3DataSegmentPuller retry bug
port hadoop druid indexer to new guice framework
Merge branch 'master' into guice-hi
fix things up according to code review comments
Merge pull request #248 from metamx/guice-hi

Port Hadoop Batch Indexer to new Guice framwork
fix layout
make indexing service work
fix things up according to code review comments
Merge pull request #250 from metamx/guice-is

Make the indexing service work with new framework
Merge branch 'master' into docs

Conflicts:
	docs/content/Loading-Your-Data.md
Finish converting docs over to something that displays properly