Bunch of changes to vim