local changes for HE
Merge remote branch 'upstream/develop' into develop

fixed config.py

Conflicts:
	salt/config.py
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into develop
added minion_denied to pki-structure to easily find denied minions
serializers fix
aggregation fix
use serializers in state.file
implements sls renderer
implement sls external pillar
implement merging strategy into pillar
Initial commit of boto_elasticache execution module.
Added support for pyenv.
Fix to avoid reading a file when no source is given

- file.managed was loading into memory the destination file even if no
  `source`, `contents` nor `contents_pillar` was specified. Changed it
  to force `replace` to False if no source was given
Add support for negations in iptables rules, add more arguments.

Arguments are normalized to contain exactly one value before parsing.
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Prevent stealing of negation.
Erased some trailing whitespace
Added support for pyenv.
Updated pyenv documentation.