Fixed jison args bug and simplified grammar using regex to idenfity tokens