Update oh-my-zsh plugin
Merge vimrc settings