Revert "zsh: Change 'sudo -s' to 'sudo -i'"

This reverts commit fa30cb88d853c03ca5502f2e8177961aef7d9c21.
Merge branch 'master' into glue