Merge work/redis-git

Conflicts:
	.gitignore
	Makefile