Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Added makeconf module

Manages setting values in the Gentoo make.conf file
Added functions to append and trim vars in makeconf
Added cflags functions to modify cflags variable
Made var_contains actually work
Added functions for common variables in make.conf
Added docs for makeconf module
Fixed bug in layman.list_local

If no overlays had been added, layman.list_local would fail with
IndexError
Updated layman.add and layman.delete to adjust make.conf

When the first overlay is added, the make.conf needs to source layman's
make.conf so that emerge sees the packages in the overlay. Likewise,
when the last overlay is deleted, the make.conf needs to no longer
source layman's make.conf as it will cause emerge to break.
Merge pull request #3160 from shadowfax-chc/layman

Layman bug fixes
Merge pull request #3159 from shadowfax-chc/makeconf

Makeconf
Fix typo in example
Merge pull request #3161 from alejandrogomez/patch-1

Fix typo in example