Made a backup of the grammar we used with Karan.

Slimmed down the function definition production. Made it more robust.
Reverted back to the end.
Merge branch 'master' of https://github.com/ty707/SCALR