Remove jedi
Tweak the python-mode settings a lot
Install mercenary
Update bundles
Ignore untracked files in bundles

I've tried to ignore the doc/tags via .gitignore, but that does not seem
to work, because each supmodule looks only for its own .gitignore file.