Improve admin user friendliness
Merge branch 'master' of github.com:ryangallen/django