Redid zsh config without oh-my-zsh
Disabled folding
Merge branch 'master' of https://github.com/mattijs/.files

Conflicts:
	vimrc.link