Feature/user configurable city name

Same as #354, but fixes migrations conflict.