a collection of small bug fixes
Merge branch 'master' of github.com:metamx/druid