add support for scanning indexes, allow external callers to call generic queries
fixed the merge conflicts
Merge branch 'bohlander-master'