Update .nvimrc
Update .vimrc
Update .vimrc
Update .nvimrc
Merge branch 'master' into rhel