feature-django-fields fixes/improvements

I cherry-picked some fixes for the work so far in this branch; I *think* they should be merged here first. The commit summaries cover the changes pretty well so I won't repeat myself here.
Let me know what you think whenever you get a moment!
Thanks :)