Feature/user configurable city name

Same as #354, but fixes migrations conflict.
Ok. Yeah, probably not worth changing. There's some funkiness witht he settingsmodal-fieldgroup class i think