Changes to pythion settings.
Merge branch 'master' of https://github.com/krasm/emacsrc

Conflicts:
	emacs-rc-python.el