upated grammar to better handle nested groups

Update things to match the new changes in how options and parameters are
handled and create a new rule for creating nested groups.  I need to write
tests for this.