Merge branch 'develop' of github.com:nmadhok/salt into create-docker-push-state
More pylint violations in salt/client/ssh/state.py and salt/states/dockerio.py
Fixing documentation(changing tag to image)
Merge pull request #13821 from terminalmage/docs

Use code-block instead of double-colon + indent
Update best_practices doc for code block issues.
Fixing pylint violations
Merge branch 'develop' of https://github.com/saltstack/salt into create-docker-push-state
Fix example for keyring driver
Passing tag correctly from state to module function
Removing unused import causing pylint violation
Merge pull request #13825 from techhat/keyring

Fix example for keyring driver
Improve modules.rbenv.install_ruby docstring.

Mention possibility of configuring additionnal environment
variables via config.get and use config.get instead of config.option
as config.option doesn't work with nested dict.
factor out chugid to salt.utils
Support for user in VT (and per se cmdmod)
pep8
Merge pull request #13823 from gravyboat/develop

Update best_practices doc for code block issues.
Update to latest bootstrap-script.sh, v2014.06.30
White space related lint fixes
Use string format
Ignore import