list-terms sorts by name.
Merge branch 'master' of https://github.com/SNePS/CSNePS
Named some vars apart for easier debugging.