Pulled latest cottidie.vim changes