Looks like the pump algorithm is OK now. Uses new 'stock' flag to indicate a pump
is used to supply stock water as well as irrigation