Properly handle PyZMQ >= 0.14 when freezing
Don't fail the setup.py if zmq is a liile on the old side
Merge branch 'merge-esky-fix' into 2014.1
Merge pull request #11506 from leoluk/2014.1

Fix esky build for pyzmq>=14.0.0 in 2014.1 branch
Add simple tool to help track down auth calls
make this a tracing thing

@basepi, please cherry these
Fix error wording

Use 'saltenv' instead of 'environment'
another error wording fix
correct error messages
Add error message when git CLI is not present and gitfs is enabled

We can't be sure that package dependencies will ensure it is installed.
Add proxy argument to virtualenv state which is passed to pip install
Merge pull request #11581 from msciciel/2014.1

Add proxy argument to virtualenv state which is passed to pip install
Handle directories in the config directory when we try to clone config
Fixing some missing PEP8ness
Merge pull request #11583 from s0undt3ch/2014.1

2014.1 tests configuration handling cherry-picks
Merge pull request #11563 from terminalmage/error-wording-tweaks-2014.1

Tweak error wording
Merge pull request #11566 from terminalmage/gitpython-nogit-error

Add error message when git CLI is not present and gitfs is enabled
Call `super()` instead.

Why wasn't super being called?
Merge pull request #11612 from s0undt3ch/2014.1

Call `super()` instead.
Load any YAML'able parameters.

Load any YAML'able parameters passed from the CLI before feeding them to Salt.