Add timeout parameter to BRPOPLPUSH

This corrects a bug in an earlier pull request.