Merge pull request #525 from blueboxgroup/logging-refactor

logging: Remove logging.conf, use log_dir only