Alphabetize the CMakefile
remove some unused function arguments
fix bad indentation
Some minor cosmetic changes
Another minor weighted-counting fix
Merge pull request #914 from linas/hmos

MOSES -- miscellaneous minor cleanup