Merge pull request #7665 from SmithSamuelM/sam_20131001

Fixed tags for progress events and preload
Merge pull request #7667 from terminalmage/issue7304

Fix race condition in salt-key
Add fileinput to list of Windows modules to freeze
Merge pull request #7670 from UtahDave/develop

Add fileinput to list of Windows modules to freeze
Add get_computer_desc
Merge pull request #7673 from UtahDave/develop

Add get_computer_desc
Add get_computer_name function
Merge pull request #7674 from UtahDave/develop

Add get_computer_name function
remove hostname arguments. not needed
overstate: Patching to fail on requisite failures.
Edit the docs with new `id` generation process
Bump windows installer version number
Switch priority of `socket.getfqdn()` and `/etc/hostname` id guessing
Merge pull request #7676 from UtahDave/develop

Bump windows installer version number
rm trailing whitespace flagged by pylint
Merge pull request #7677 from hulu/pylint

rm trailing whitespace flagged by pylint
Retrieve ID from cache if possible
PEP8 line length
Cache any non-IP guess of minion ID
Only log that we're guessing the ID when that is actually true