fix how druid services is assembled
Merge branch 'master' of github.com:metamx/druid