CDB-3619 JSON2CSV initial version working and specced
Merge branch 'CDB-3685' of https://github.com/CartoDB/cartodb into CDB-3685

Conflicts:
	Makefile