Fix some stuff.
Merge branch 'master' of github.com:sixohsix/env