Update vimrc, zsrhc
Merge vimrc with edits from github