Added a couple nice options from sensible.vim