Adding salt.config to mock
Merge branch 'develop' of https://github.com/saltstack/salt-cloud into develop