re-adding geonames.template
Merge branch 'feature/refactoring' into testing