CDB-4006
CDB-4006 streaming working, pending some code cleanup
Merge branch 'master' into CDB-4006
CDB-4006
Merge pull request #740 from CartoDB/CDB-4006

CDB-4006