Merge branch 'todo.vim'