Small bug fixes to grammar
More bug fixes

Down from 170+ shift/reduce conflicts to 11, still have 45 reduce/reduce conflicts
Solved all reduce/reduce conflicts

Still have 5 shift/reduce conflicts (3 need to be solved)
Merge pull request #14 from kaitlinhuben/khuben/testing

Grammar bug fixes