Removes geo option
Do not re-geocode rows wit cartodb_georef_status != NULL
Re-add named place option to GeocodingsController#country_data_for
Merge branch 'CDB-1927' of github.com:CartoDB/cartodb into CDB-1927
Merge CDB-1927 into release/2.13.2