Bugfix and flatten with unvendored handlebars.js