Add ()'s around 'and' action in ast2peg and update tests so they all …#1

pd-giz-dave wants to merge 1 commit intochowette:masterchowette/parser-gen:masterfrom

pd-giz-dave:masterpd-giz-dave/parser-gen:masterCopy head branch name to clipboard