Merged Changes after re examin

Some more merging after re examing the diff between redis 2.4 and redis
2.6