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
Added support for pyenv.
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.
Merge remote branch 'upstream/develop' into develop

Conflicts:
	debian/changelog
	debian/control
	salt/__init__.py
	salt/master.py
give the minion the ability to evaluate its master from a modules function upon start
fixed *.upstart and rules
fixed mode
Enable prereq and prereq_in in pydsl
We now need to pass `--allow-external` to pip
We need to allow `--allow-insecure` in order to install python-novaclient
We need to add `--allow-all-external` in order to work
We now need PyLint <= 1.2.0