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
overlay->repository
Use an unicode aware context in the jinja render call. Refs #3436
Only `basestring`'s should be `unicode`'d.
Update before environment check-- to make sure you get all the branches
Add links to 0.16.0 Salt Windows installer.
Handle cases where _gem() returns False

This prevents a traceback when _gem() returns False due to a problem
running the gem command. Fixes #5886.
updated suse package for release 0.16.0
Fix potential tracebacks when _rbenv_exec() returns False

Fixes #5888.
Fixing update of repo, it was updating the .git directory, but not the filesystem that is used for the pillar data
Handle failure cases in rvm module

Fixes potential tracebacks when _rvm() and _rvm_do() fail. Fixes #5889.