Fixed redis cookbook
Fixed up redis cookbook
Fixed merge conflicts