Add global timeout
Merge pull request #195 from joshtombs/jt/timeout

Add global timeout