Improved handling of timeouts to keep them from going off when unnecessary. Closes #23.
Merge branch 'master' of github.com:sandialabs/slycat