Flatten and reapply #202 on top of master.
Fix a few more oversights.
Merge pull request #216 from basho/sdc-indexes-rebase

Flatten and reapply #202 on top of master.