removes pypy, adds jedi, adds misc changes