added underscore templating support
misc changes, underscore templates now supported.