1) Take in g9yuayon's pull request, fix merge conflicts and formatting
1) Left some log lines in the tests...  That's no good.
Merge branch 'master' of github.com:metamx/druid