vim: bring over more stuff from master branch.