More work on converting everything to use the venv version of ipython