more updates to indexing framework, bug fixes
more updates
Merge branch 'master' of https://github.com/DICE-UNC/indexing