updates
Merge branch 'master' of github.com:kian/dotfiles

Conflicts:
	zsh/zshrc.symlink