[importer] Fix merge conflict
[importer] Log when a geometry column is renamed to invalid_the_geom
[importer] Raise when trying to geometrify from an empty geometry column
[importer] Make Column#drop execute DROP IF EXISTS
Do not raise if CartoDB::Metrics can't connect to Mixpanel
[importer] Clean up DataImport
[importer] Consistent state after merge conflict