Add timeout parameter to BRPOPLPUSH

This corrects a bug in an earlier pull request.

(I tried to add it to the old one but it wasn't picking up the changes.)