Merge pull request #71 from salt-formulas/andrewp-yaml-git

usable yaml_git and mixed storage types