Added environment cleanup.
Merge branch 'master' of github.com:isbm/spacewalk-power-toys