removed merge
fixed pillar grabber in debian config
fixed pillar grabber for remaining configs
Merge remote-tracking branch 'origin/pr/4'
Revert "removed merge"

This reverts commit 125917b7d6600009185d382ca3c9e238068a5878.