This changeset fixes issues 2 and 3 (for me).

Testing Done: unittests
...

When reindexing only remove the keys/scores that we intend to adjust.

Also adjusted the return value of _unindex to be more meaningful.

Fixes #2
Fixes #3