Removed temp. python.
Merged mainstream to local branch.
Local option's changes.
Merge of upstream.
Merge branch 'master' of https://github.com/eugeneai/emacs-for-python

Conflicts:
	custom.el
	init.el