Unset environment variables more consistently.#242

smarnach wants to merge 2 commits intomastermozilla-iam/mozilla-aws-cli:masterfrom

clear-security-tokenmozilla-iam/mozilla-aws-cli:clear-security-tokenCopy head branch name to clipboard