Update todos and README
Merge branch 'master' of https://github.com/bion/frankendank

Conflicts:
        todo.org