Cleanup and make code more consistent
Cleanup and make code more consistent

- Use bash's extended test command - [[ ... ]]
- Quote some unquoted $ signs
- Use local instead of global in load_env_file

jtoy/experimenter,shamrin/shoreman,chrismytton/shoreman,bf4/shoreman,jmrenouard/shoreman