Move logger.yaml to logger.yml
Merge branch 'master' into alex