Fix grammar

I was running into an issue where the version of PEG.js used in `grunt-peg` wouldn't build the parser.

Once I updated `grunt-peg` the tests were failing so I addressed that too.