Use a different node type in the unit test...

The unit test is currently using a node type that I want to make disappear.
Add new link-grammar specific link types.

Perform some additional cleanup of the types file.