cspp common parser
Update from parser code review
Merge pull request #304 from JeffRoy/cspp_base

Cspp base
Merge remote-tracking branch 'upstream/master' into gduke_spkir
Code cleanup. No functional changes.