This is only needed for salt versions older than 2014.7 that do not
define the global "salt" variable in such context.

Most include do not expect salt to be something else than the usual salt
variable giving access to all the salt modules. Instead we use cfg_salt.
And for consistency we rename the master/minion variables to
cfg_master/cfg_minion too.

In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.

This state downloads formulas from git repositories and ensures
that they are recorded in the file_roots setting.

better newlines with iterations.

This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks

Updated gitfs jinja, to mirror master file

Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate

This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.