link whole emacs.d
more emacs config
updated zshrc
Merge branch 'master' of github.com:SKoschnicke/dotfiles

Conflicts:
	emacs