Fixed template again
Changes to redis cookbook
Fixed merge conflicts
Fixed merge conflicts