Some fixes from @tpope's simple.vim