Merge pull request #42 from hawesie/hydro-devel

Bug fixes for demanding and routines, plus additional cancellation services.
Merge pull request #43 from hawesie/hydro-devel

Added callback for checking whether tasks should be sent to scheduler.