Zshell updates.
Merge branch 'master' into bachelorproject
Merge branch 'bachelorproject' of https://github.com/knub/dotfiles into bachelorproject