pymode variable name-change, two submodule updates