Don't try to reset encoding if running on PyPy - it doesn't like us reloading sys
Merge branch 'master' of github.com:dnanexus/dx-toolkit