allow vim to fold without requiring {{{
update todos
fix several lines after rebase