Fix up and add plugins for vim