Add vimperatorrc
Merge branch 'master' of github.com:koshian/dotfiles

Conflicts:
	zshrc
Fix conflict