remove python-mode.el, since there is a newer version in emacs 24.3
Merge branch 'master' of https://github.com/lucasp0927/Emacs-setting