Corrected catching timeouts in unit test.
Merge remote branch 'upstream/master'
Turn down log level for frequently printed log.
Merge pull request #300 from emilyhahn/master

Correct class catching timeout exceptions in unit test