adds new columns to cartodb importer
adds timeout to cartodb uploader
Merge pull request #155 from unepwcmc/cartodb-columns

Cartodb columns