zshrc exit status
Merge branch 'master' of github.com:mklein-de/dotfiles

Conflicts:
	zshrc
mutt
Merge remote-tracking branch 'havsule/master' into osx