fixing tests for osx adding more stupid env crap
Merge branch 'release-1.10' of github.com:amoffat/sh into release-1.10