Bunch of updates to vim