(TK-95) Ensure default timeout is 60 seconds

Fix issue wherein the default shutdown timeout was 30 seconds
rather than 60 seconds.
Merge pull request #89 from fpringvaldsen/TK-95-timeout-fix

(TK-95) Ensure default timeout is 60 seconds