update todos
Merge branch 'master' of github.com:mfrederickson/ssat