Mine over raet
Fixing lint in salt/daemons/flo/core.py
Fixing lint in tests/integration/shell/auth.py
Fixing lint in salt/modules/tls.py
Fix broken test.
use get incase id not in opts
Merge remote-tracking branch 'upstream/develop' into sam_raet_49
Merge pull request #13947 from SmithSamuelM/sam_raet_49

Used get. for some reason opts['id'] not always available
Improve file.directory documentation around `recurse
Merge pull request #13948 from basepi/filedirctorydoc13866

Improve file.directory documentation around `recurse`
Add newest cherry-pick to 2014.1.6 release notes
Merge pull request #13950 from basepi/2014.1.6release

Add newest cherry-pick to 2014.1.6 release notes
Merge pull request #13936 from cachedout/mine_raet

Mine over raet
Merge pull request #13939 from nmadhok/fix-pylint

Fixing lint
Merge pull request #13942 from cachedout/call_test_fix

Fix broken test.
Add reactor example for updating fileserver on git push
Merge pull request #13955 from terminalmage/docs

Add reactor example for updating fileserver on git push