Update to do list
Merge branch 'vim'