Added handlebars.js and minor tidyup