Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21.

This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request. This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb51833156a75354090c6ff7dd8794bc8
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:47:15 +0000

Remove stray character

commit 660c48a528baf4e09bb7cc3ccd30afd7bf46072d
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:46:40 +0000

Fix various HTML syntax errors