revert redis_port.conf.erb
Merge remote-tracking branch 'evan/master' into evanstachowiak/master