minor changes to admin
Merge branch 'master' of github.com:dgrant/django_recipes

Conflicts:
	recipes/admin.py
Merge branch 'master' of github.com:dgrant/django_recipes
Merge branch 'master' of github.com:dgrant/django_recipes
Merge branch 'master' of github.com:dgrant/django_recipes
Merge branch 'master' of github.com:dgrant/django_recipes

Conflicts:
	recipes/admin.py