add forced timeout
Merge branch 'master' of https://github.com/invisiblefriend/stir
err hanlder
added debug statements, fixed test
fixes #2
undo timeout shim