This second master config example was causing problems when vagrant
would use the default pillar.example

Added version check for provider/driver backwards compatibility

Renamed "provider" to "driver"

Prefix configuration files with the suitable O/S-specific pathname

Without this change, importing map.jinja in config files (as opposed to
SLS files) causes a rendering error because `slspath` isn't defined.
The `salt_settings.key_url` variable gets used only in
`salt/pkgrepo/debian/init.sls`.

add formula file this fixes #211

Take mine_functions back

Add Windows support to map.jinja

This adds some minimal support for Windows minions.

Fix Windows repo settings using values from 2015.8 documentation

update 2015.8.7 version config for the minion

merge options from 2015.8.7 version in f_defaults.conf

Revert PR #200

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