replaced log4j with slf4j
Merge branch 'master' of https://github.com/korpling/salt.git