Update to add handlebars support
Sync and resolve