Resolves issues introduced in 24ebbb4e0c.

When running a high-state on the salt-master to deploy itself, the run fails
with an Authentication error occurred because the master restarts half way though.

X

Available only on Debian family OS-es

Instead of the default service.running + enabled, you can control
the actual state, via pillar.
And you can even say 'state = ignore' and no state will be generated
to control the service

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

Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.

If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.

New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104

Using a variable named salt is a bad idea when salt already has a variable
named salt.

Update sls files to match name change in map.jinja.

Added map.jinja solution more in line with other formulas,
This also improves issue #30

and pull request #30

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

Closes #45

Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made