updated vimrc and vimrc.osx
added zsh plugin git-extras