getting rid of nosetests
Merge branch 'code-quality' into peid-client-change
check termination exception
Merge pull request #156 from SuperCowPowers/code-quality

getting rid of nosetests