Merge pull request #310 from cpoulain/master

Fix change in logic to locate config file: env.cfg_path must be set befo...