Fix typo

Conflicts:
	salt/modules/pip.py

Conflicts:
	salt/modules/pip.py
Randomize salt cloud deployment directory

Conflicts:
	salt/utils/cloud.py
Correct path

Conflicts:
	salt/client/ssh/__init__.py
Remove unusued testing code
Use local bootstrap

Conflicts:
	salt/modules/config.py
	salt/modules/seed.py
Fixing bootstrap script to install python-apt for Ubuntu minions and Debian minions greater than the 5.0 (Lenny) release.  With some recent changes related to virtual packages, python-apt is now necessary to be able to manage packages.
Align tmpdir and deploy dir
Support for new reapeds dict produced by presence management
Requires Raet v02.11
Update docs for using salt-cloud on OSX to install curl-ca-bundle
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14611 from SmithSamuelM/sam_2014.7

Support for updated presence behavior in Raetv0.2.12
Merge pull request #14603 from garethgreenaway/bootstrap_fixes

Fixing bootstrap script to install python-apt for Ubuntu & Debian minions
Fixing docstrings for archive.tar to be consistent.  Per 14308.
Merge pull request #14616 from garethgreenaway/14308_archive_tar_documentation

Fixing docstrings for archive.tar to be consistent.
Merge pull request #14610 from rallytime/cloud_docs

Update docs for using salt-cloud on OSX to install curl-ca-bundle
Fix trailing whitepsace
Merge pull request #14636 from rallytime/pylint_fix

Fix trailing whitepsace
Specifying defaults for salt.states.user.present
Making the language more clear. Fixes #14623
Specifying defaults for salt.states.user.absent