Minor edits to achieve XHTML validation

such a pain
Merge pull request #1 from rupertdance/master

Minor edits to achieve XHTML validation