WTF ... really

[Spuds]

OK I think this puts these two new templates back to what was in the latest version of those templates that they were grabbed from ... its great how github will simply overwrite an old file with a new one, super deluxe really

Also updated another in my long line of spellng errors (yes that one is on purpose)

[norv]

We can merge this if you like; it seems correct that something got messed up, I'm not sure I get how this happened.. And I didn't test this but the code diff looks as expected at a quick check.

[Spuds]

Bah ... For all I know I'm just delusional at this point and whats there is right ! I can't get some things to work in my local and it claims to match the master, yet they work on the site .... about ready to nuke everything local and start over!

[norv]

Instead of nuke, I'd just clone in some other directory to check.

(of course, this is how I get a dozen repos and 3-30 branches in each, which I haz no clue where they are and why they are anymore, but hey!)

Actually for all I see your html5 changes did get missed - presumably when I split the files, but... it shouldn't have done that. (lol)

On another note: you can always reset your local branch to sometime long back in time, then pull from elk master.
i.e. git reset --hard [a hash from a few days ago]
Just make sure you commit or stash your current changes before, because reset --hard ain't joking, it does overwrite/remove everything current.