Upgrade build

This includes several different commits that I made in the pursuit of being able to mix in external clojurescript code with a presentation. Feel free to pick and choose if you don't like all of it.