Merge debian/rhel and update redis.conf
Merge branch 'master' of github.com:zxjinn/puppet-redis

Conflicts:
	templates/redis.debian.conf.erb