Made exiting on deadlock optional. Improved deadlock detector.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>