Sync up with bitbake/contrib/vim

Signed-off-by: Christopher Larson <kergoth@gmail.com>