parser: corrected token length for two word commands

the token length for two word tokens was incorrectly set to the length
of the second word plus one for the space between the words; changed to
set the length to the current position (the first character after the
second word) minus the starting column of the first word (which also
takes into account if there are more than one space was entered between
the two words)
updated files for version 0.4.3

also includes some minor cleanup (corrected tabs and spacing)