Fix path in submodule
Merge branch 'master' of github.com:jeroentbt/.emacs.d

Conflicts:
	.gitmodules
	vendor/znc