Minimally recovered from horrible merge/rebase mess.  python and jedi seem to be okay again.