Settings.jinja now pulls from pillar.

Previously, a user would have to alter settings.jinja to set the
proper includes, excludes, conflict resolution type and group name.
This information is now pulled from pillar.