Wait for local workers to exit
Merge branch 'batch_wait_for_locals'

Fixes bug seen by Evan, in which killing the pool does not clean the workers up.