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
properly format roster function string
deal with conf_file being a file nto a dir
selected target is None when defaulting to glob
Patch up switch from ip to data
update to data structure changes
clean up option generation from pre class setup
return a string for a failure
self, not salt
Fix for 5867

removing unecessary function