More improvements to htmlbars
Merge pull request #10 from zzarcon/update_handlebars_again

More improvements to htmlbars