Pulled cottidie.vim changes