Always give saltenv argument highest priority
Saltfile feature initial parsers work
Pre-SaltConf changes
Pre-SaltConf patches.
Allow for config settings to be overridden by a `Saltfile`

The order of configuration handling is the following:
1. If the user passes an option to the parser, that option rules.
2. If no option is passed to the parser and that option is set a
`Saltfile`, that option rules.
3. If none of the above and such option is set in the cofiguration file,
that value rules
4. As a last resort the default value rules

The format of the `Saltfile` is:

```yaml
<salt-cli-tool>:
  <confi-key>: <config-value>

salt-key:
  ssh_max_procs: 50
```
Make sure the user knows a Saltfile will be loaded.
Change output of states.service to reflect changes

If a service is started, but already enabled, changes are now
reflected to the user.
Merge pull request #1 from s0undt3ch/hotfix/saltfile

Salfile
Merge branch 'develop' of github.com:saltstack/salt into develop
pkg.installed/latest: don't refresh_db if refresh==False

See https://github.com/saltstack/salt/issues/5733#issuecomment-33888898
for further information.
remove unused apparently-unnecessary **kwargs from npm.{installed,removed}
Automatically resolve dependencies if deb file sourced.

 - Uses python-apt module to check for missing dependencies
    and resolve them using apt-get.

 - deb package is then installed in the previous fashion
Mark the missing dependencies as auto-installed.
Fixed a typo in variable name.
lint fixes. thanks jenkins!
Merge branch 'develop' of github.com:saltstack/salt into develop
Improve detection of changes when pull or build an image
Improve documentation on running salt as non-root
break out fields in event fired instead of parsing out of plain text
Retry query on certain EC2 status codes