CDB-3706 Added config support for redis timeout
Merge pull request #651 from CartoDB/CDB-3706

CDB-3706
Merge branch 'CDB-3696' of github.com:CartoDB/cartodb into CDB-3696