Merge branch 'master' of github.com:rawland/dotfiles

Conflicts:
	zsh/zshrc
Merge branch 'master' of github.com:rawland/dotfiles

Conflicts:
	zsh/zshrc