Rename TODO to TODO.rst
Merge remote-tracking branch 'upstream/master'
Update README.rst to describe use of a local Kaji submodule.
Change nagvis submodule origin to kb2ma/nagvis.

* kb2ma origin includes Debian postinst fix.
Update nagvis from upstream
Update from upstream adagios and kaji packages.