zsh
Merge branch 'master' of github.com:jbohren/i3files