Pull all the changes from the Django 1.5 version of my base template, and clean things up a little bit.