De-activate jedi and tweak wikipedia-mode settings
De-activate jedi and tweak wikipedia-mode settings
Merge branch 'master' of https://github.com/lmichelbacher/emacs