making markup pretty.  properly nesting to preserve header and footer tags.
Merge commit 'f319fdce214bcd61617c62e69ada4487491e810e'

Conflicts:
	partials/lists.html