Add user-configurable city name
Merge pull request #356 from flibbertigibbet/feature/user-configurable-city-name

Feature/user configurable city name
Renamed indicator/file; added tests and new test params