Merge branch 'develop' of github.com:maxchk/salt into develop
Merge branch 'facter-load-puppet-libraries' of github.com:maxchk/salt into facter-load-puppet-libraries