ooici/marine-integrations — pull request #300 by emilyhahn (2014-07-21 17:16:25+00:00)
Title: Correct class catching timeout exceptions in unit test

@wfrench please review.
The incorrect class was being used to catch timeout exceptions in the dataset unit tests. Class pyon.core.exception.Timeout was being used when gevent.Timeout is actually needed, so no timeouts were ever being caught.