fixed merge conflict
Merge pull request #56 from sadris/slickwater3

added config option for slickwater amount in mixer #2