* fixed the bug for pypy-5.8.0

* changelog entry
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* use std-lib sub-env
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* let's see if this cleans things up
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* try v7 of stdlib
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* use new sub_env
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* set_env
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* set_default_env
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* v8 of stdlib
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* v112
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* oops (merge bug)
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* final merge error resolve
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* final final fix for merge conflict
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>