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
Merge pull request #5816 from mgwilliams/pillar-include-defaults

nesting for pillar includes
Fix more class refs to the Shell class
Tie off some minor additions here
Remove the evil dash of doom

Good catch, @s0undt3ch!  =)
Merge pull request #5818 from basepi/releasedocs

Remove the evil dash of doom
Fix traceback on non-yum systems

3b8b6de added yum.rpmtrans.RPMBaseCallback as a base class for
the _YumLogger class, which causes tracebacks on non-yum systems. This
commit fixes that by only creating this class if the yum python
interface is successfully imported.
Merge pull request #5819 from terminalmage/quickfix

Fix traceback on non-yum systems
Make openSUSE <12.1 use sysvinit for service mgmt

This fixes #5801 by checking the major release of the distro, if the
minion is openSUSE.
Merge pull request #5821 from terminalmage/issue5801

Make openSUSE <12.1 use sysvinit for service mgmt
Resolve Issue #5822
Merge pull request #5823 from quantumsummers/develop

Resolve Issue #5822
overlay->repository
`ensure_in_syspath` now accepts multiple paths. Make use of it.
Merge pull request #5815 from s0undt3ch/develop

Don't ignore environment variables pointing to valid configuration files
Remove hyperlink until new link is found
Merge pull request #5826 from UtahDave/develop

Remove hyperlink until new link is found
Fix folder name for external pillars in docs