Avoiding name collision
Merge branch 'master' of github.com:vespakoen/salt-states