This restores the original structure/behavior of the
`salt_formulas` Pillar key.

Support for downloading formulas from multiple baseurls into same environment

add consul config support to master config file

Replace pkgrepo with offical Saltstack repo

add support for gitfs whitelist and blacklist

issue #180

Dropped ppa and updated to official repos for ubuntu

Add support for returner configuration in salt minion

Add support for returner configuration in salt minion

Conflicts:
	salt/formulas.jinja

Add clean_file to wipe saltstack.list contents

Make Debian use pkgrepo.managed

fixed ext_pillar and master_tops to get more options

Replace deprecated iteritems() with items()

Never fall back to `cfg_salt['master']` in minion config

- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
  `salt:minion:master`

use salt_settings.syndic_service so state works on FreeBSD, too

Manage show_jid option in master configuration

Remove trailing whitespace from master config

This makes it easier for users to check the status of jobs that ran into
a timeout.

Add master_type option

Filter all calls to formulas_git_opt through load_yaml

Jinja macros are not actually functions.  The only thing they can return
is a string.  In order to return structured data, the callee must
serialize it, and the caller must deserialize it.  This state formula
uses YAML as the intermediary, hence the occurrence of both the
`|yaml` (callee) and `|load_yaml` (caller) filters in its code.

The post-render "mapping values are not allowed here" error in
*salt/formulas.sls* or the broken rendering of
*salt/files/master.d/f_defaults.conf* happens because invocations of the
`formulas_git_opt` macro in several Jinja `set` statements do not get
deserialized, resulting in the trailing newline followed by three dot
characters (`...`), which YAML uses to signal the end of a document.
Correcting these rendering errors requires adding the necessary
deserialization code at those locations (i.e., filtering the macro call
through `|load_yaml`).

Fixed conflict with git-formula

Remove mapping test

This test isn't available in certain popular versions of Jinja (namely the one
installed by default in CentOS 6).

Improve flexibility/quality of pygit2 state

Configure the salt-api service to start at boot time

Only watch salt-api package if install_packages=true

Also watch salt-api pkg instead of salt-master one.

Fixed pillar_roots generation for salt-master.

With a simple pillar like this::

    $ sudo salt-call --config-dir /srv/etc/bootstrap --pillar-root /srv/pillar pillar.get salt:pillar_roots
    local:
        ----------
        base:
            - /srv/pillar

This was generated in /etc/salt/master.d/f_defaults.conf::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:base:- /srv/pillar
    #

Resulting in parse errors by salt::

    $ sudo salt '*' state.highstate
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^

This patch will fix it as such::

          ID: salt-master
    Function: file.recurse
        Name: /etc/salt/master.d
      Result: True
     Comment: Recursively updated /etc/salt/master.d
     Started: 11:37:12.946823
    Duration: 6255.296 ms
     Changes:
              ----------
              /etc/salt/master.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -528,7 +528,9 @@
                       # Pillar is laid out in the same fashion as the file server, with environments,
                       # a top file and sls files. However, pillar data does not need to be in the
                       # highstate format, and is generally just key/value pairs.
                      -pillar_roots:base:- /srv/pillar
                      +pillar_roots:
                      +  base:
                      +    - /srv/pillar
                       #

Resulting in::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:
      base:
        - /srv/pillar
    #