merge changes to get npython working again on windows

fixes #39