update
Merge branch 'master' of https://github.com/imbahom/dotfiles

Conflicts:
	vim/vimrc
	zsh/zshrc