Update .nvimrc
Update .vimrc
Update .nvimrc
focus tweeks
Merge branch 'master' into ubuntu