Fix --config-file CLI option
Drink ignored any configuration file paths passed by the --config-file command-line option because of a small bug.
Refactor the logic slightly to make the precedence between the environment variable and the command-line argument clearer.