Make pep8 (more) happy.
Ooooupss… making environment shortcuts work again
Give a useful docstring to the generated environment activation functions.
Merge remote-tracking branch 'origin/stuff' into master.