modified:   pillar/top.sls
	modified:   states/salt-cloud/cloud
	modified:   states/salt-cloud/cloud.profiles
	modified:   states/salt-cloud/cloud.providers
Merge branch 'master' of https://github.com/russellballestrini/egg

Conflicts:
	states/salt-cloud/cloud