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.
Merge pull request #3260 from s0undt3ch/develop

Last Minute Fixes for 0.12