Merge pull request #1 from whiteinge/raet-auth-router

Changed a few router defaults
Merge pull request #15164 from thatch45/raet_route_fix

Fix raet resolver routines
Try `sftp` before `rsync`
Merge pull request #14358 from terminalmage/issue13980

Use install instead of installmissing if Chocolatey >= 0.9.8.24
Merge pull request #15178 from nshalman/cleanups-20140821

SmartOS esky build environment instructions cleanup
get_instance_health

Get a list of instances and their health state.
Example:
```
myminion:
    ----------
    - description:
        N/A
    - instance_id:
        i-1234567e
    - reason_code:
        N/A
    - state:
        InService
    ----------
    - description:
        N/A
    - instance_id:
        i-1234568e
    - reason_code:
        N/A
    - state:
        InService
    ----------
    - description:
        N/A
    - instance_id:
        i-12345675
    - reason_code:
        N/A
    - state:
        InService

```
Add mako deprecation warning
Merge pull request #15184 from techhat/cloudep20147

Add mako deprecation warning
Remove "flaten" outputter

This is being moved to salt-contrib and renamed to "flatten" to fix the
spelling mistake. It needs some refinement before if can be officially
released.
Merge pull request #15185 from terminalmage/remove-flatten

Remove "flaten" outputter
Merge pull request #15158 from s0undt3ch/hotfix/salt-cloud-upload-fixes

Make salt-cloud fail on upload failures
Stop using deprecated access to message attribute

The message attribute has been deprecated. See:
http://legacy.python.org/dev/peps/pep-0352/#retracted-ideas
Missing exc
Merge branch '2014.7' of https://github.com/pakdel/salt into pakdel-2014.7
Lint
Merge pull request #15198 from thatch45/pakdel-2014.7

Pakdel 2014.7
Merge pull request #15192 from cachedout/exc_message

Stop using deprecated access to message attribute
A more correct fix for 82cf61a

The lack of an "as" clause was intended, the real bug was a misnamed
variable containing the error message to be logged.
Update to latest bootstrap script, v2014.08.23

* Avoid redirect breakage when installing EPEL with rpm on RHEL 5
* Ensure python-apt is installed by the bootstrap script for Debian & Ubuntu minions. Thanks @garethgreenaway.
* Don't shallow clone on git versions lower than 1.7.10
* Only shallow clone on git tag based installations
* Configurable Salt repository clone directory for git based installations
* Distro Support Fixed:
* Fixed the URL to download EPEL for Cent 5
* Use the full path to the `chkconfig` binary when checking for services in SysV init systems.
* Fixed an issue where the default sleep period(3 secs) on Ubuntu would cause a race condition with upstart wherein the package installation would call an upstart start and before it could complete, bootstrap would call another. The result was *two* copies of salt running which ended up causing a most stubborn bug that's documented in saltstack/salt#12248
Update salt-cloud gce docs to use downloaded p12 key file