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