Signed-off-by: Rene Jochum <rene@jochums.at>

Have salt-api service watch the master config files

The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.

allow non-default config settings in master.d/f_defaults.conf …

Pkgrepo cleanup

Correct SmartOS config path

Add SmartOS salt-master, minion and gitfs support

update map.jinja after Arch renamed the package

make the configuration of engines specific to master or minion

Add state that ensures pkgrepo for RedHat is absent

Change default value for pillar_opts

Adding support for master_id option

typo - top_file_merging_strategy (f_defaults.conf) template

Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.

the engines are now configured using the following pillars:

* salt.master.engines
* salt.minion.engines

instead of a global salt.engines pillar.

Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)

fix minion daemon to be enabled if master_type is set to disable

add option to start minion service if master_type is set to disable

add missing files

add engine and reactor config to salt minion configuration

By default don't install cloud dependencies using pip

The salt-cloud packages automatically pull in the pycrypto and libcloud
dependencies for RedHat and Debian (at least when using the SaltStack
repos), so it doesn't really make sense to install these dependencies
using pip. By default we no longer use pip, but the old behaviour can be
restored by setting 'salt:use_pip' to True in the pillar.

There could probably be a case made for removing the pip stuff
altogether, but we will leave it in for the time being to preserve some
backwards compatibility.

Fixes saltstack-formulas/salt-formula#190

Clean-up master.d/f_defaults.conf and add winrepo_provider

Add yaml_utf8 option to salt master configuration.

Handle config opts not part of default config.