Tidy up name and model matching in SuperSimple "Foo['']" tokens
Refactor some code in the SuperSimple parser for simplicity
Added support for nested masterpages to the SuperSimple parser
Added some MasterPage tests for SuperSimple engine tests