Merge conflicts
Emacs: add some python setup