Support for dynamic master in maps

Resolves #403.
Don't require volumes option
Merging #432, fixing minion dict