Updates.
Merge branch 'master' of https://github.com/mattccrampton/matt_crampton_unix_env