CDRIVER-360 add additional geo index options

Changes here also resolve CDRIVER-452
Want me to make minimal changes? I'm fine either way. Let me know.