added empty action to all non terminal optional rules to get rid of bison warnings
Fixed function call ambiguity with a merge function ;)
updated grammar file
Merge branch 'mortimer/function_ambiguity'