nvim: fix a bunch of bugs master


Author gpanders.com
Date Commit Parent f521dda6