merge osm_conf + osm loader
merge osm_conf + osm loader
Merge branch 'master' of https://github.com/webtorus/osmtorus