Support for dynamic master in maps
Merge branch 'develop' of github.com:whodatninja/salt-cloud into develop