Final tweaks.
Merge branch 'master' of https://github.com/jpullen/html5-hardened
Some cleanup