Compat fixes for Django 1.6

This is a subset of #928 that gets us closer to Django 1.6 without actually switching to it.
All of our production flatpages have HTML, not markdown, so I think it's okay to drop this if it is no longer in Django.