Fix parser

Builds off of #42. Removes the generated JavaCC files and updates the .jj grammar files.