forgot to add these
Merge branch 'master' of https://github.com/DjangoAdminHackers/django-scaffolding