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
Add info about pillar refresh.
Fixed version-check logic for already-installed npm packages

This fixes installing a new version of an already-installed package.
Add ssh_config example for GitPython
Merge pull request #15236 from terminalmage/gitpython-ssh-config

Add ssh_config example for GitPython
Merge pull request #15234 from cachedout/pillar_refresh_doc

Add info about pillar refresh.
Merge pull request #15203 from terminalmage/fix-chcocolatey-exception

A more correct fix for 82cf61a
Merge pull request #15207 from s0undt3ch/hotfix/bootstrap-script

Update to latest bootstrap script, v2014.08.23
Merge pull request #15235 from whiteinge/npm-updated-existing-install

Fixed version-check logic for already-installed npm packages
module.lxc: support for complex network scenariis.

This allow to set additional network nics where the gateway can be setup on.
This allow for exemple eth0 to be on an hostonly network while eth1
is wired to the physical host throught another bridge and eth1 is holding
a publicly addressable IP.

cc @mgw @thatch45 @s0undt3ch @regilero @squizou @jpcw @samaradona
lxc: override default gw
Disable service.py for entire SUSE family >= 12

Checking os_family allows us to pick up openSUSE and SUSE Linux Enterprise, rather than just checking for os == openSUSE.
Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state
Fix versionadded string
Fixes based on comments
String substitution lint fixes
fixed bug preventing salt-cloud to work when there are machines without ip addresses reported by azure (i.e. suspended vms)
Query rpm to determine arch on Fedora. Fixes #14850
Replace all occurrences of "Digital Ocean" with "DigitalOcean"