Merge pull request #67 from salt-formulas/andrewp-compose-node-name-fixes

Update mixed and yaml_git for compose_node_name changes