Merge branch 'master' into task-stuff
changes to remote task runner to kill nodes better
Merge branch 'task-stuff' of github.com:metamx/druid into task-stuff