template updates
Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history