Moving some generic code into the right places
Merge branch 'master' of github.com:DjangoAdminHackers/django-adminskin