Some vimrc cleanup;
Update vimrc and zshrc;