Code review comment for lp:~nskaggs/help-app/content

I managed to fix a couple of small issues, which resulted in merges from trunk, which made the diff look quite big. Let me know how it works for you.