Minor tweaks to .cproject, makefile, and NCCmdHistory.cpp to clean up
after merge