Merge the latest changes

Now with handlebars, and improved element1.js. next up will be a proper "build" process.