Converting to django_localflavor_us addon instead of contrib in anticipation of moving to Django 1.5