Avoid nesting
Merge branch 'master' of github.com:suzaku/dotfiles

Conflicts:
	zsh/.zshrc