Refactor and finish w/ DB timeouts
Refactor and finish w/ DB timeouts

nuxcode/cartodb,codeandtheory/cartodb,CartoDB/cartodb,nyimbi/cartodb,splashblot/dronedb,dbirchak/cartodb,thorncp/cartodb,DigitalCoder/cartodb,bloomberg/cartodb,thorncp/cartodb,future-analytics/cartodb,future-analytics/cartodb,bloomberg/cartodb,codeandtheory/cartodb,nyimbi/cartodb,DigitalCoder/cartodb,DigitalCoder/cartodb,codeandtheory/cartodb,splashblot/dronedb,UCL-ShippingGroup/cartodb-1,UCL-ShippingGroup/cartodb-1,CartoDB/cartodb,future-analytics/cartodb,dbirchak/cartodb,UCL-ShippingGroup/cartodb-1,DigitalCoder/cartodb,nuxcode/cartodb,CartoDB/cartodb,bloomberg/cartodb,CartoDB/cartodb,nuxcode/cartodb,DigitalCoder/cartodb,UCL-ShippingGroup/cartodb-1,splashblot/dronedb,bloomberg/cartodb,thorncp/cartodb,nyimbi/cartodb,dbirchak/cartodb,codeandtheory/cartodb,splashblot/dronedb,nyimbi/cartodb,CartoDB/cartodb,thorncp/cartodb,thorncp/cartodb,dbirchak/cartodb,nyimbi/cartodb,nuxcode/cartodb,future-analytics/cartodb,UCL-ShippingGroup/cartodb-1,nuxcode/cartodb,dbirchak/cartodb,future-analytics/cartodb,bloomberg/cartodb,codeandtheory/cartodb,splashblot/dronedb