Uppercase C
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699

* 'CDB-1699' of github.com:CartoDB/cartodb:
  Remove admin0 geocode option