Parser re-factoring

[simonpoole]

Re-factor parser

This changes the parser to use a more "normal" tokenizer and adds support for child and parent expressions.