update TODO
Merge branch 'master' of https://github.com/weien/DataConference2013
update TODO