Merge pull request #1 from metamx/master

Update to latest master
Merge remote-tracking branch 'metamx/master'
Merge branch 'master' of github.com:metamx/druid
Add documentation for extensions and modules to 0.6 version of Druid
Merge pull request #280 from cheddar/master

Write some docs for modularity and extensions