Remove vim-autoformat
Bunch of vim tidy ups
Don't need z now as it comes in via ohmyzsh