More fixes for migrations so they don't trip the auto detector in Django...

... 1.7

For some reason a couple verbose_name's did not exactly match what is in the models which would trigger creating migrations locally.
Fixed UserSettings.language to point to settings.LANGUAGES to prevent a similar issue as #3479