keep rules.  don't be stupid
Merge branch 'feature/django-upgrade' of github.com:tedw4rd/alexandria into feature/django-upgrade