Fix getting the output of `git describe` into salt's version string. Added a test case for this too.
Fix `integration.shell.matcher.MatchTest.test_ipcadr`.

Was skipping because of the latest output changes and how output parsing was done.
Always return (version, version_info) when trying to get data from git.
Filter `Unknown distribution option`'s when not installing with setuptools.
Allow a test to specify it's own `run_function` timeout. Increase timeout for some tests.
Fetch git tags on travis-ci. Needed for tests.
Force `LC_ALL` to be `C` in non windows systems. Fixes #3261.
Fix stack trace in master scheduler
Merge pull request #3260 from s0undt3ch/develop

Last Minute Fixes for 0.12
Merge pull request #3263 from s0undt3ch/issues/3261

Force `LC_ALL` to be `C` in non windows systems. Fixes #3261.
Fix race contition execption in gitfs
Allow config.option to omit sources
don't load the schedule from the master config
Allow a list of returners to be passed into the scheduler
Add a schedule_returner option
Add scheduler doc
Add jobs to the toc
Kill stray semicolon
Fix an elif issue
Merge branch 'develop' of github.com:saltstack/salt into features/minion-subclass