new file:   setup.sh
	deleted:    mklinks.sh
	modified:   zsh/zshrc
Merge branch 'master' of https://github.com/spillevink/dotfiles
	modified:   i3/config
	modified:   i3/i3status.conf
	modified:   zsh/zshrc