various updates to vim stuff