This reverts commit 22b8dde1ff.

This reverts commit 14b466e022.

Add support for GitPython and salt-ssh on FreeBSD masters

Done at the maintainer's request.

salt.api state fails

Seems there are several colons missing for salt.api to work correctly, hope I found all of them

This change tweaks the GitPython package installation state to support
alternate package names (on FreeBSD, it's called "py27-GitPython").
Also, on FreeBSD salt-ssh is included in the "py27-salt" package by
default, requiring an update to `distro_map`.

Fix stuff suggested by @iggy.

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

Install cherrypy/tornado from pip only if use_pip is True for salt-api.

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

Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.

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

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

Updated master.d/f_defaults for 2014.7

Fix syntax error

Fix syndic requisites

The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.

formulas.jinja: python 2.6 support

formulas.jinja: python 2.6 support

Remove hardcoded paths with {{ slspath }} variable

The git command line tool is a requirement of pygit2

Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)

* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository

Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example

Remove Duplicates from defaults.yaml and map.jinja

fix empty formulas list in pillar with empty dic.

Fix pillar_roots configuration format in master

This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:

```yaml
pillar_roots:
  base:
     /srv/salt/dir1
  dev:
     /srv/salt/dir2
     /srv/salt/dir3
  locale:
     /srv/salt/dir4
```

Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:

```yaml
pillar_roots:

  base:

     /srv/salt/dir1

  dev:

     /srv/salt/dir2

     /srv/salt/dir3

  local:

     /srv/salt/dir4

```

The minion configuration is not affected and renders fine.

add pillar_roots for minion and master in pillar.example

Cleanup template for easier user reading

The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not

fixed missing add-apt-repository command when ubuntu is the server one

fixed wrong command name: add-apt-repository became apt-add-repository

ec2/gce profiles/providers are no longer configured if they are not used

Needed because salt-cloud will attempt to load them even if they are
filled with invalid default values, creating error spam.

Added config setting for:

* pillar_source_merging_strategy

Added pillar option to redirect profile and map folders.