update grammar
Merge pull request #28 from cbess/master

Update grammar and code fmt