Upgrade to handlebars 2