Fix comment form
Merge branch 'master' of github.com:johnkhughes/zero

Conflicts:
	comments.php