Corrections to admin.py files, modifications to models to use django-cities