Merge branch 'todo.vim', just for fun