first draft
Merge remote-tracking branch 'upstream/develop' into ebuild_enhanced

Conflicts:
	salt/states/portage_config.py
some fixes
merge fix
other merge fix
added check_extra_requirements function
check_extra_requirements documentation
some fixes
fixes
doc fix
Restructure for topics/conventions/ docs

Add index.rst for conventions
Add the Salt Release Process to the documentation
Add conventions to the TOC
Merge pull request #5808 from basepi/releasedocs

Add the Salt Release Process to the documentation
fixing apt.mod_repo to work on ubuntu < 12.04
Merge pull request #5812 from nevins-b/develop

fixing apt.mod_repo to work on ubuntu < 12.04
Don't ignore environment variables pointing to valid configuration files. Fixes saltstack/salt-cloud#661

`salt.config.load_config()` cannot be hard-coded to use only the master configuration file as the default configuration file path to know if the user has passed any configuration file in the CLI tool or not.
To fix this, `default_path` was added. This way, the minion config or client config or even the salt cloud config can say which is the expected default path of the configuration file and properly load config from environment variables.
pillar: allow include to provide a key within which to next
pillar: allow include to provide a key within which to nest -- bugfix
pillar: allow include to provide a key within which to nest -- another bugfix