Remove forgotten traceback formatting, fixes #158
Merge pull request #161 from KennethNielsen/issue_158

Remove forgotten traceback formatting, fixes #158
Fix bugs in subscription timeout code