Visual preferences.
Logical preferences.
local config
Merge branch 'master' of https://github.com/eugeneai/emacs-for-python

Conflicts:
	custom.el