update vim and zsh dotfiles
Merge branch 'master' of github.com:aotimme/dotfiles

Conflicts:
	zshrc