Modified git part
Merge branch 'master' of https://github.com/nuklly/emacs.d

Conflicts:
	init-git.el