Html5

This contains all the changes I have for you. Quite a few of the commits are blank 'merge' commits as I was figuring my way around things, but the final state should be fine :)