clean up a few validation errors found on a hunt for a missing </p> -- and add that </p>
Merge remote-tracking branch 'origin/design-2012-11-13' into design-2012-11-13