Cleaning up in-code doxygen doc blocks.
Merge branch 'devel' of github.com:/dmorse/simpatico into devel
Merge branch 'master' into devel