Refreshed build instructions for Windows
Added salt.utils.validate to setup.py.
Merge pull request #7843 from valentinbud/develop

Added salt.utils.validate to setup.py.
Merge pull request #7838 from ekatsah/fix-trail-slash

Fix remove possible trailing slash in name of mounted state
Merge pull request #7799 from eliasp/auth-ldap

External auth LDAP improvements
Merge pull request #7840 from scottp-dpaw/patch-1

Refreshed build instructions for Windows
Catch AttributeErrors and fall back to default outputter. Refs #7845.
Updated salt.states.alternatives to fix incorrect docstring.

Doc string for salt.states.alternatives.set_ appears to be compied and pasted from salt.states.alternatives.remove and does not correspond to what the set_ actually method does.  Fixed this.
Give them both! This should make some cleaner middle ground here
Merge pull request #7847 from cachedout/develop

Catch AttributeErrors and fall back to default outputter. Refs #7845.
Merge pull request #7848 from loz-hurst/develop

Updated salt.states.alternatives to fix incorrect docstring.
Merge pull request #7675 from Caustic/overstate-patch

overstate: Patching to fail on requisite failures.
Merge pull request #7807 from scottp-dpaw/develop

Bootstrapping for Windows minions
Catch an error where salt-run might fail with a KeyError on master_uri. Thanks, Tom!
Merge pull request #7849 from cachedout/develop

Catch a condition where salt-run might fail with a KeyError on master_uri. ...
Make sure that ssh keys don't get added with incorrect encoding types.
Remove original return call
clear out unused masterstate function
Fix #7526

This should prevent already loaded mods from being reloaded from the
top level of the matches
Add install, deinstall, and update to freebsdports module