CDRIVER-360 add additional geo index options

Changes here also resolve CDRIVER-452
ARGH! those keys are right next to one another... wait are they... no, they are not.