Merge with upstream.
Added magit.
Linum exacly loaded.
Merge with upstream.
Merge branch 'master' of github.com:eugeneai/emacs-for-python

Conflicts:
	custom.el
	init.el