Added explicit examples of how to use versions with npm
Merge pull request #9537 from s0undt3ch/develop

Update regex to new versioning scheme.
configurable salt git url for jenkins
Merge pull request #9538 from makinacorpus/jenkins-stuff

configurable salt git url for jenkins
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
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
Remove hardcoded version, we're regex matching.