Throw nice error on the off chance that PyYAML is not installed.
Merge branch 'develop' of github.com:cro/salt into develop
Manually back out bad commit