I rebased to clean things up a bit, so you have to look at the individual commit.
https://github.com/metamx/druid/commit/9fc5cca663db94577a579a40cc8fac3758898eba