Wait for StopCommands to execute and give option to override, and nuke the deprecated NOWAIT config option.
Merge branch 'master' of http://github.com/Subsentient/epoch