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.
Add support for negations in iptables rules, add more arguments.

Arguments are normalized to contain exactly one value before parsing.
Prevent stealing of negation.
Added support for pyenv.
Updated pyenv documentation.
Resolved merge conflicts.
Removed the warning just for testing.
For some reason the install_pyenv state wasn't present.