update TODO list
Merge pull request #22 from regehr/todo

update TODO list
Merge remote-tracking branch 'upstream/master' into jubi-branch