fix typo and also testing commit
Merge branch 'master' of github.com:metamx/druid