Several bug fixes

Now templates w/o a <%= declaration will compile
Small bug with parser fixed
Extra parameter added to generated functions to make
master/slave templates easier