Incorporate subst grammar into base w new test.

I also split and renamed base_grammar.water into layer1.water and
layer2.water. These files are compiled by make_base_grammar_cmd.sh
into base_grammar.water, which is read by parse.py at startup.

This is a milestone; I consider v1 of substitutions to be working.