updated emacs for python
Merge branch 'master' of github.com:balle/emacs