Enabled doctests in nnindexer and mindexer. Also made old merge in pyinstaller that we missed