Remove premature specialization declarations for currentToken()
Merge remote-tracking branch 'upstream/collaboration' into nvp
Adjust header to match source
Fix StateParser for compilation -- does not compile due to errors in dependencies
Merge remote-tracking branch 'upstream/collaboration' into nvp
nvp compiles but is still **UNTESTED**