Got rid of stupid python-mode, now using python.el.
Got rid of stupid python-mode, now using python.el.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Got rid of stupid python-mode, now using python.el.

Conflicts:
	init.el