Adding timeout to scheduler.
Merge pull request #70 from hawesie/hydro-devel

Adding timeout to scheduler.