improve my vimrc and add settings for iterm