Remove admin0 geocode option
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699
Merge CDB-1699 into release/2.11.0