add xclip from vim
update zsh
merge conflict oon dotvimrc
Merge branch 'master' of github.com:yulrizka/configurations

Conflicts:
	vim/dotvimrc