Merge pull request #204 from klynton/master

Fix even more instances of 'environment' that I missed.