Speedup server shutdown / restarts.  Closes #68.