Tidy up Vim config a bit