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
@djs52 please test your pull reqs
Get rid of stray print
Include Travis-CI in the hacking doc, it makes our life easier.
Merge pull request #3132 from s0undt3ch/develop

Include Travis-CI in the hacking doc, it makes our life easier.
Add the ability to parse a whole directory full of repos
Merge pull request #3138 from techhat/repo

Add the ability to parse a whole directory full of repos
Fix #3137
Added state for layman.

Adds the ability to ensure overlays are added or deleted via layman
whack-a-mole
Merge pull request #3139 from seanchannel/develop

whack-a-mole
Console logger now writes to `sys.stderr`. Make PyLint happier. Fixes #3135.
Chaned layman state functions to conform to other states.

Changed added to present and deleted to absent