Run the unit tests before the integration tests
Timeout the test runs
Merge pull request #1908 from dstufft/ugh

Run the unit tests before the integration tests