Pulled recent cottidie.vim changes