be properly backwards compatible with environment variables
Merge branch '1_4_refactor' of github.com:Strider-CD/strider into 1_4_refactor