Pulled latest cottidie.vim