Some default minion/master options are `None`, let's set a reasonable default.
Merge branch 'develop' of github.com:saltstack/salt-cloud into develop
Don't assume `HOME` is in the `os.environ`
Merge pull request #473 from s0undt3ch/develop

Some default minion/master options are `None`, let's set a reasonable default