Python.el  & python-mode.el conflict fixes
python + magit
gitignored init.el
Merge branch 'master' of https://github.com/adamczykm/emacs-live

Conflicts:
	etc/custom/custom-configuration.el
	init.el