Update todo
Merge remote-tracking branch 'upstream/master'
Change kaji submodule origin to kb2ma/kaji, and merge latest.

* kb2ma origin includes commits to work on Debian.
Merge latest upstream changes for adagios.
Add instructions to README.rst for updating from a Kaji Meta clone.