removing tcp-backlog since it causes errors in ubuntu 14.04 LTS redis
Merge remote-tracking branch 'david-thorman/master'