add from MAGI
Merge branch 'master' of https://github.com/nuklly/emacs.d

Conflicts:
	.gitignore
	eshell/history
	eshell/lastdir
	nuk/init-custom.el
	nuk/init-yasnippet.el
	nuk/snippets/python-mode/for