clean up of the parser; tests need to be updated
Merge branch 'master' of https://github.com/CowanSM/ncSOS