More bad merge screwups fixed
More bad merge screwups fixed

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