update fields for v1
update logstash docs
Merge pull request #9536 from whiteinge/npm-version-examples

Added explicit examples of how to use versions with npm
Removed old/unused rST substitution
Added note that docs are for the development version
Client testing

 * Minor spelling and doc fixes to client module
 * Unit testing client module.
Pylint fixes.
fix numerous pylint C0325 (superfluous-parens) warnings

"Unnecessary parens after 'XXX' keyword"
utils.network.remotes_on_local_tcp_port: trivial simplification of condition
modules.mount.active(): fix FreeBSD check
utils.network._interfaces_ipconfig(): fix botched singleton tuples

Python 2.7.6 (default, Nov 11 2013, 11:11:46)
>>> # Parentheses don't make tuples. Commas do that.
>>> ('Subnet Mask') == 'Subnet Mask' != ('Subnet Mask',)
True
>>> x = ('Subnet Mask')
>>> type(x)
<type 'str'>
>>> y = ('Subnet Mask',)
>>> type(y)
<type 'tuple'>
>>> # Why this went unnoticed:
>>> key = 'Subnet Mask'
>>> key in ('Subnet Mask')
True
>>> # Why this is problematic:
>>> key = 'Mask'
>>> key in ('Subnet Mask')
True
Merge pull request #9546 from hulu/network-tuples-fix

utils.network._interfaces_ipconfig(): fix botched singleton tuples
Merge pull request #9545 from cvrebert/patch-2

modules.mount.active(): fix FreeBSD check
digital_ocean._get_node: rm unused 'location' arg

salt/cloud/clouds/digital_ocean.py:543: [W0613(unused-argument), _get_node] Unused argument 'location'
digital_ocean.script(): rename local var to avoid shadowing

************* Module salt.cloud.clouds.digital_ocean
salt/cloud/clouds/digital_ocean.py:520: [W0621(redefined-outer-name), script] Redefining name 'script' from outer scope (line 516)
Remove hardcoded version, we're regex matching.
modules.yumpkg5._parse_pkginfo(): avoid shadowing

************* Module salt.modules.yumpkg5
salt/modules/yumpkg5.py:74: [W0621(redefined-outer-name), _parse_pkginfo] Redefining name 'version' from outer scope (line 227)
Merge pull request #9542 from cachedout/unit-tests

Unit tests
Merge pull request #9544 from cvrebert/patch-1

remotes_on_local_tcp_port(): trivial simplification of condition
Merge pull request #9549 from cvrebert/patch-3

digital_ocean.script(): rename local var to avoid shadowing