Fixes issue(s) in saltstack/salt repo issue #11096
Fixes issue(s) in saltstack/salt repo issue #11096
reverted bad/unnecessary fix
Merge branch 'develop' of github.com:sandbender/salt into develop
re-removed :/
Add 2014.1.3 release notes
Update doc version to 2014.1.3
Major rework of the master job cache. This moves the local cache on the master off into a returner (local_cache) and changes everyone to use that interface.
add modules locale.avail and gen_locale
Move the job cleanup into the returner
added locale.present state
Move the .p file names into global variables within the module-- so they are in one place
Consolidate job dir into a private function
Merge branch 'job_cache' of github.com:jacksontj/salt into job_cache

Conflicts:
	salt/runners/jobs.py
Fix comment
Remove local jid_dir override from testing
Better comments
indent
indent
shorter line