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
Fix file.contains: search for the string rather than requiring an exact match
In file.sed: "after" is not a regular expression
Changed _run to not set stdout=None when retcode=True

See bug #2640 for more details
Merge pull request #3125 from fsniper/develop

Develop
Merge pull request #3126 from djs52/develop

Small fixes to file.sed
Merge pull request #3129 from shadowfax-chc/retcode

patch to fix #2640
@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