[todo.vim] move "regex" upper than "string" to avoid incorrct coloring
Merge branch 'todo.vim'
Merge branch 'master' into develop