pulled in changes from main .vimrc